Issue #2323605 by recrit: Handle single-parent terms properly