General clean-up and ensure consistency with "produces": values