0.8.7.1 compilation.  Added support of comparator switching.