Refactor unification of invocation failures (issue #19)