A bit of cleanup.