Why did you change that? That's not a good change at all, now it does pointer indirection every time instead of just comparing fixed addresses. Please revert that.