Handle non-symlinked device mapper devices better, also stop treating dm devices as special