If you merge in the newest master, all those silly `u` prefixes become unnecessary. (`r` is, on the other hand, still usefull)