Polymorphic comments

These commits implement polymorphic comments.