more hier_delim fixes