Merge change 9401

* changes:
  Clean up the way we handle postfix operators.