Fix keywords list construction to include doc-comment keywords.