Steal code (though disabled), a few other small refactors... something made this get really slow for -np >= 3