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...
If I had to be picky I would say that these `Raw-Upload ID` and other fields should be constants