Fix support for switches style option in user commands
Container utility functions now use the free begin/end functions
Store key names in a constexpr array