In light of macros providing for delayed commands, I think I am going to have to implement a "cancel" command.

The purpose of this will enable a future command to be cancelled ie pull a delayed off command out of the queue, to extend an on period.

Using this will mean that when a motion detector detects motion, it will cancel any outstanding off commands from the previous detection, guaranteeing that the light will remain on for the expected delay time.