Switch to use 'ndims' instead of 'skip_1d' in templates