more PR feedback
- put JSExprPhase back to the way it was
- other minor stuff