Refactoring of metaprogramming for new keywords