Moves `normalize comments` and `return if comment`

This commit moves them back up above transform calls to minimize any
unintended side effects regarding comments.