Unification tweak; better disambiguation

Fixes #963. Do alternatives after normal arguments so that more type
information is available.

(Ideally, order shouldn't matter - would be better to retry alternative
resolution if there were still ambiguities at the end, but this will be
fiddly to set up as things currently are.)