Replace hand-crafted zero matrix with zero-matrix function call