Move things we can into a switch statement

Commit

4 years ago

Move things we can into a switch statement Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>