Cleaned up the process of constructing annotated FramedGraphs.