5118c3e1e9
because we can't really rely on the "additional length" being correct (any more?). Fixes some problems with devices showing up as "<, , >".