The key change is that for stores less than 5 bytes, the correct place for the trampoline to return is immediately after the backpatched jump, not somewhere inside it.