main
Keep comments when converting coalesce expressions
Ensure sub-expressions are still cleaned up.
Renames