OPTIONAL MATCH support in Prettifier
Fixes to BigLabelStoreGenerator