Oops, committed the fix for MacBook keyboards.  Need to split out separate Mac config options.