Untangle cyclic tag system code from tag system classes