Refs #5300 Tidying code.
Refs #5300 Correction to output workspace logic.