Next stage of fixing the break/continue generation.