Minor fix to encoding for XCM v1 (#3602)

14 jobs for master in 43 minutes and 58 seconds (queued for 37 seconds)