Fix handling of non-recursive build wrap cases.