Add U as ungreedy option, soft deprecate r