Using the standard (type class based) transitivity tactic for more contr...

...olable proof terms. As discussed in #454.
Looks like an incomplete merge here.