Would you consider moving this logic into ```add_dim_coords``` and ```add_aux_coords``` so other code can take advantage of it?