Wrap to 100 characters.

Remove the delete workaround; it's not much of a workaround.