Add support for matrices. Less aggressively convert to strings.