Re-apply the memory operand changes, with a fix for the static