o Smallish cleanup pass.