Some cleanup - committing so I can unstash the stuff I was working on before.