[PATCH] matrox maven: memory allocation and other cleanups