Fix recursive pointer handling... again