NH-3251: Fixed compilation failures and then many test failures due to trying to convert non-terminals to roots.

(cherry picked from commit 30ec217)

Author: patearl