Further cleanup.

Reviewed by @tolmasky.