Add #next_check and always wrap instance checks