improve re capture of NS/VAL groups, inner funcs