There are still some calls to dev2unit() left, but I guess we should take care of those another time.