Simplify trigger argument handling.
1.0.2