Update to match spec changes where @reverse can have @type and other @container values.