Adapt for changes in uisprimepower (NULL no longer permitted in second argument).