Refs #7965 More refactoring.
Refs #7965 Correcting C2Se.