-(defsubst mime-entity-info-reversed-number (entity-info) (aref entity-info 0))
-(defsubst mime-entity-info-point-min (entity-info) (aref entity-info 1))
-(defsubst mime-entity-info-point-max (entity-info) (aref entity-info 2))
-(defsubst mime-entity-info-media-type (entity-info) (aref entity-info 3))
-(defsubst mime-entity-info-media-subtype (entity-info) (aref entity-info 4))
-(defsubst mime-entity-info-parameters (entity-info) (aref entity-info 5))
-(defsubst mime-entity-info-encoding (entity-info) (aref entity-info 6))
-(defsubst mime-entity-info-children (entity-info) (aref entity-info 7))
-
-(defsubst mime-entity-info-type/subtype (entity-info)
- (let ((type (mime-entity-info-media-type entity-info)))
- (if type
- (let ((subtype (mime-entity-info-media-subtype entity-info)))
- (if subtype
- (format "%s/%s" type subtype)
- (symbol-name type))))))
+(defsubst mime-entity-node-id (entity-info) (aref entity-info 0))
+(defsubst mime-entity-point-min (entity-info) (aref entity-info 1))
+(defsubst mime-entity-point-max (entity-info) (aref entity-info 2))
+(defsubst mime-entity-media-type (entity-info) (aref entity-info 3))
+(defsubst mime-entity-media-subtype (entity-info) (aref entity-info 4))
+(defsubst mime-entity-parameters (entity-info) (aref entity-info 5))
+(defsubst mime-entity-encoding (entity-info) (aref entity-info 6))
+(defsubst mime-entity-children (entity-info) (aref entity-info 7))
+
+(defsubst mime-type/subtype-string (type &optional subtype)
+ "Return type/subtype string from TYPE and SUBTYPE."
+ (if type
+ (if subtype
+ (format "%s/%s" type subtype)
+ (format "%s" type))))
+
+(defsubst mime-entity-type/subtype (entity-info)
+ (mime-type/subtype-string (mime-entity-media-type entity-info)
+ (mime-entity-media-subtype entity-info)))