Some minor improvements to parse_merge_name().