Fixing invalid type/subtype variable declarations.