Remove dead code.
Rename remaining non-m_-prefixed variables.
Attack of the style police.