Support: clean up comments and Support notation

Closes gh-1577