Remove extra dispatch variable

... to addresss variable shadowing warnings and handle the 2 global
commands that do not require a dispatch.

Bug: b/399867568
Test: build
Change-Id: Ifda27fedf02e2edff7030d9f646be7da14c61ef5
1 file changed