Correct some more places where TO_PTR() should be used.
These were missed in r326228.
MFC after: 2 weeks