Savaged the easy part of the work on the decouple-logic-trees branch
Fixed a misprint
Merge pull request #1339 from gem/savage-decouple-logic-trees

Savaged the easy part of the work on the decouple-logic-trees branch
Merged from master