Commented out NXOS namespace additions in _wrap function