WIP: A little bit of cleanup.