No copy matrix args

To be applied after or instead of previous pull req.