Extracted comment fixes

This may not fix all issues with extracted comments, but it's a start
I guess if anyone complains their weird code's comments don't get extracted, we know where to look :wink: