Simplify MatrixBuilder implementations using inner classes.
Add convolved MatrixBuilder