Typo-fixes/cleanups.