#4 and #7, Cleaned up the MathMl support and added a test.