More optimizations (more specific clause_mat)