Put inconsistent handling of matrices back in to verify against NTH's results.