Reworking of the goto/labels stuff.