Merge "Clean matrix arguments"