Further terminus generalization.

Change-Id: Ief3ba1b82141b96b149c8cf1f76ec3e945d0edc9