We can leave wrapNS unchanged: new ability to override returned value used only in new patch
(part 7 for #31)