Refactoring to align more to java spec on expressions