continue to normalize deviceType handling...