[chore] Refactor common supported type code

[neenjaw]

Small refactor to co-locate Comment common type checks.

P.S. Thanks @jiegillet for letting me do this small chore, let me crawl through the code a bit as I have been less connected to it lately. I appreciate.