new logic for processing bolus and wizard events

What's it says on the tin. More info on strategy in code comments. I'm too pooped to repeat myself...
also would be easier if these (e.g. `bolusNormal `) were consts too