correct selection of current type for multi-type parameters: #536

This check was exactly the wrong way around, so the code to select
the appropriate type wouldn't run when it was actually needed.
Merge pull request #560 from AdamWill/536

correct selection of current type for multi-type parameters: #536