Extracted comment fixes

This may not fix all issues with extracted comments, but it's a start
Doubt it. I'm trying to think what that would look like in code, I guess it'd be quite weird anyway. The test case below is extensive and covers pretty much everything I'd expect to work. Probably good as it is.