Compile in matrix.c in case we need FF-style functionality for
matrices later