Merge "Remove unnecessary level of priority indirection"