Add missing getopt support for 'U' from f406c7b