Merge branch 'separate-formulae' at this point where things compile
and look OK on static analysis. Next: cleaning up some names, and then
maybe testing something?
Renamed things.
Changed the front end thingy to call different functions depending on
whether distinguishing formulae are required. No performance
improvement. <sigh> Also removed trailing whitespace and fixed
indentation.