Even more pointer pre-asserts

(comment removed after commit replacement)