Fix typos and turn awful structures into merely bad.