These changes all look good, but I'm concerned about conflict with rt46077b,
which also touched the mkeys test substantially. I think it might be best
to delay merging this until that one's done. rt46251 can go in right away
though.