AllCommands: make variables more local