Fixed bugs introduced by Newick/NEXUS output refactor.