Code cleanups.

No functionality changed.