More convert prettying.

I'm scared to try a rollback again.