A bit more cleanup of my own.