Fix isHighlight and isComment logic

I acted too quickly on these edits. I can squash them up.