Re-apply 66008, now that the unfoldMemoryOperand bug is fixed.