Change algo for attaching comments to nodes to do this early
Refactor tests and add some more assertions
Add hint support to ternaries and conditions as well