Small fixes for -P; properly handle names with a plus, and
prefer patches.