Add more "spoke-detach" mode checks.