Fixes #2692 which was incompletely fixed by #2711. Also adds updates stats/stat_test.go to sanity check WireLength.