~wip [#201] Nb general refactor, add support for more flexible conn-t…

…ype upgrade/downgrade

Initial strategy here is simple, may or may not turn out to be useful; still
need to check. Point was to get something more flexible that we can build on
in future.

Also took the opportunity to do some signf. refactoring while I was in the
code.