Streamline autodetection in ...::Update