Finally purged all mention of matrixes.