INT-3554: Expression Setters Polishing

JIRA: https://jira.spring.io/browse/INT-3554