"struct device" and the bogus unit number mentioned in the error message. Some other minor cleanups, all trivial.