Typo and dead code fixes.