WIP: Tidy a bit.