Fix expr refactoring rebase

Change-Id: Ice4846c65945f3fc06a2c18db136482966c632dc
Reviewed-on: http://gerrit.sjc.cloudera.com:8080/3858
Reviewed-by: Henry Robinson <henry@cloudera.com>
Tested-by: Skye Wanderman-Milne <skye@cloudera.com>