Further metaprogramming tests and correction from removing Array M typedefs