Not all AWSProperty instances must have properties (for example, Cloudfront's S3Object type). Only fall through to a dict with a 'Type' property if the current class has a 'type'.
Fix pep8 error.