REFACTORING: compound label matching no follows the new generator/partition convention