Refs #5300 Tidying code.
Refs #5300 Correction to output workspace logic.
Merge branch 'feature/5300_moments_sqw_tab' into develop