More clean-ups of the metaprogramming