removed old single-line next_statement