Refactor method marking toremove the need for the embed_methods decorator.