Committing a little cleanup.