Fixed up NontransformerBranchList and minor cleanups for toString()