A bit more cleanup of stuff that I missed.