[jhc] darcs patch: fix instance of U2U primitive not being ... (and 5 more)