Clean up comments inside expressions
Merge pull request #3325 from yebblies/lastcomments

[DDMD] Fix last remaining comment issues