Ok, all fair arguments -- I'll go ahead & merge.

Re set vs. add APIs -- they both seems like they'd have some utility in different use cases.  Since there's a getter, extensions could always use set to accomplish the equivalent of add... so unless we find that add is a very common operation, maybe set is good enough?  (To me, modifying comment syntax in any way seems quite uncommon compared to adding a file extension).