add better support for "continue" and "break"