Move the conditional to should_output_store()