Merge change 6248

* changes:
  Clean up expression code.