generic/620: fix order of require_scratch calls