Fix even more cases of pointers-are-not-integers.