[PATCH 1/3] When handling hidden devices in getDeviceBy*, don't use +=.