I agree, it's cleaner to have it all in one place, I've moved the location of this into the ExpressionChecker.