Cleaned up the object model related to Goto and Conditional targets.