r13170: Remove some dependencies on -1 implying the size of pstring