Change to only use one set of if blocks for determining job output type