[expect] Improve mock "return" matchers to properly handle calls that throw#6172