cmd-key-happy: cpp-impl: updates for Mavericks