uau::amf::core::Envelope - refactoring