spiral: Fix CANCEL behaviour (and CANCEL test).