psmerge: Port SUN/164 to new format