Some changes to try and mitigate the long priority assignment operation.