Reorganised data structures to allow for easier transition to graphical
form. Method calls within methods are now the only feature left to be
handled before graphs can be drawn.