Some small cleanup commits.

Cleanup.