Refactor to tidy up triggers a little.

Changes to Heriox pipeline mean these can all be consistent now.