Replaced reference to OldStyleApi with id<UQServerApi> where applicable.