No REALLY, get rid of ConstantPointer references