Extracted comment fixes

This may not fix all issues with extracted comments, but it's a start
:grinning: