Worth factoring this check for "orig" out into PJUtils? I think it's useful elsewhere.