Fix a bunch of nonsense I broke when deleting words.