Make CPtr work again

Feature-wise we should now have recovered
from the refactor.