system: move some checks into existing switch/case blocks
system: move some checks into existing switch/case blocks

paradajz/OpenDeck,paradajz/OpenDeck,paradajz/OpenDeck,paradajz/OpenDeck,paradajz/OpenDeck,paradajz/OpenDeck