Small cleanup.
Cleanup #2.