Small cleanup before bigger cleanup.