Completely mechanical changes, but there were a lot of lines so I made
it a separate patch.