Return values of correct types (BUGZ-4206)
One of these is semantically inert: it changes from NULL to false, but the value remains the same.
The other one changes from erroneously returning 0 on failure to returning -1 on failure, like all the other cases in the same function.