Revamped use of QuitAdapter
Small clean-ups in SpinCube