hkbd(4): Reduce diff with ukbd(4)
(cherry picked from commit 3ef9023f935ff721f72ed44cf26911b9af72dba1)