Style fixups.
Extract base class.