Switch to double-equals in callback return check