Fix regression in ExtracTempTest18 (change in PSTR) and add missing type
annotations in more locations
Temp fix for broken(?) test