And update test-keymap-util accordingly. While at it, make sure to use tabs everywhere. (cherry picked from commit 04957284) (cherry picked from commit 644a8ca3) (cherry picked from commit b47bc5bd)