Added rudimentary non-local escapes.