Fixing up Math types to be created the same way.