Better approach to fix #495

Explicitely make terminals call parent operator= so
we're sure this critical code path is the same on
all compilers.