More wireformat tinkering