This is a matter of taste. The current approach was chosen by Roland and  
adopted by me, because it makes it more FSM like. Not super-important,  
though, I like your approach, too.