Be less restrictive on key comment extraction

Created by: cinderblock

This is the same pull request as #8515, rebased to the current master.