correcting some wrong dispatches and return types in complex if_else
Merge pull request #763 from jtlap/if_else_problem

correcting some wrong dispatches and return types in complex if_else