Remove unreachable MatrixPowerTriangular, paving the way to future cleanups.
Simplify class hierarchy.
merge