mov edi,edi is _not_ NOP in 64-bit, use 66,90h instead. This bug was causing interception unittest to crash on Windows64.
Credits to etienneb for finding the root cause.
lgtm