Clean up metaprogramming