[fix] Fix reformatting of strings with bad splits

This commit signifigantly dirties up the code introduced in this PR
(#1132). I plan to clean all of this up considerably before merging with
master.

Author: bbugyi200