This also fixes the maximum allowed ioprio class: 8 -> 7
No actual code changes, just some splitting out.