Changed some more behaviors to be generated from the matrix.

Saves some code and simplifies adding new families a bunch.