- Remove some unnecessary nesting - Add frame type (SOF0, et al) to metadata if `.return_metadata` is used