Check _all_ the device storages, and simplify the code a bit.