Remove matrix vararg and use generators (iso module)