Change remove_next_keyword behavior