Simplify ehandling; add BEGIN/END marks.