Cleanup: move m_needsRollback from public to protected.  Remove stale
imports.