Handle bolus and wizard objects

@jebeck @kentquirk 

These are the changes to handle wizard and bolus objects.  With this, all of the object types should now be handled, so next up is actually running this thing against some real data and either rejoicing that it works or fleshing out unit tests.

Let me know what you think.
This looks like it's testing the same kind of scenario as `dualNoNormal`?