Did a quick check with various layouts configured with `setxkbmap` and this didn't change the results for any of them except for the dvorak layout which was no better detected. 15165e916dd9719125add752de4f66bc855c9d16 looks good regardless of the scoring changes.