Try to fix the mess I made of devname, with the minimal subset of the
larger minor/major patch which was posted for testing.