Simplify trigger test.
Add label modifiers.