Fixed my broken implementation of the new autoaway routine.