Much more hacking on assert-exception.