Issue #2329783 by lauriii, jamesquinton | davidhernandez: Move comment classes from preprocess to templates.