Fixed by removing the FIXME (which I copied from the original ORDER_HANDLER), which is just wrong.
And removed TODO from the end of the comment (maybe it can be addressed in a later revision, when I, or others, are clearer in my mind).