Well the diff contains a useable activate function now as a framework
when it did not before.  After a few conversations with Kirill, he
understands why I want these functions written in a particular way
(or else, they diverge and become difficult to compare and judge and
fix)

How about getting that in, then improving the device operations it
needs to do?