Small cleanup changes.