Modifies macros in template class table.
Adds finite state machine class Macho.