Change matrix macro syntax