#1031: #1021: updates comment anchors, also #949

opened by njr2128