Avoid some more direct pointer manipulation