Canonicalize more devcb2 (nw)