Tidy up the splicing of the support operations.
Introduce mechanism for supporting characterisation.
Fix the characterisation workflow.