Fixup SplitCHParsed and DerivativeTwoPhaseMaterial (#4035)