Basic cross-platform key mappings
Eliminate race condition from current-keyset generation
Change arg name