Addressing issues with ExpressionMapper logic.
Closes #584