Fixing type annotations for special object types.