REPORT-487 - Mapping parameters to expressions should support numeric addition and subtraction