Remove goto chain

The selector logic is clearer with if / else if
1 file changed