Fix typo.
Misc. cleanups.