Initial untested changes to comment-tagging.js, some changes still remain.