More type spec fixes

Type specs are revised to reflect production uses that
do not result in errors.