Second installment of refactoring code into data

I now move onto the second, more awkward, section of the
imperative code to refactor to an adaptive model. This shows how
I need to massage both the imperative code to make it fit the
model's structure better, and the model to support more
capabilities. I then finish by comparing the imperative and
active model approaches.