logic tree unpruned

Proliferation of logical tests in general functions was done to generalise functions to cases both encountered (some infrequently) and hypothetical. Code can be optimised by separating cases into purpose-oriented functions and removing tests for  options always/never encountered.