Started cleaning ExpressionMapper.cs.