Remove the need for explicit nil check on blockdevices