Fix and quote the compound matcher
The default value is not `None`
Minor output changes