Fix some movement-detected logic

At each stage of the sequence it was overwriting the status from the
previous steps. This looked like a bug to me - what do you think?