This is getting somewhere.
A bunch more automatic changes.