cleanup - code for raise_exception stmts should be in branch issue-748, not in this one.