Fixing up, keeping device in consistent state.

There's nothing obvious anymore that puts the device
in an inconsistent state.  Playing around with fprint_demo,
I can no longer muck it up.  Can start enrollment, cancel,
verify, cancel, etc.  Activate and deactivate are working
properly.