Adds true/false keywords and replaces the null group with a more general keyword group.