Minor improvement to Device.init