Put Matrix funcs in Common, simplified