Fixup handling NSArgumentDomain arguments

would fix #2216