s4:libcli/wrepl: avoid neested named structures