Ok, I thought about this probably way more than it was worth. And I think we might as well just go ahead and make this change. The only sensible situation is with both a new kernel and new userspace -- everything else is broken anyway. So I just applied this as-is. - R.