More cleanup (to be squashed).