with+script fix applied to all code, not just object code.