Add more pointer pre-asserts