Follow on to last patch to clean up goto handling
Follow on to last patch to clean up goto handling

mtwebster/cjs,mtwebster/cjs,endlessm/gjs,mtwebster/cjs,pixunil/cjs,endlessm/gjs,magcius/gjs,magcius/gjs,joeshaw/gjs,pixunil/cjs,djdeath/gjs,magcius/gjs,mtwebster/cjs,endlessm/gjs,pixunil/cjs,pixunil/cjs,joeshaw/gjs,pixunil/cjs,djdeath/gjs,djdeath/gjs,joeshaw/gjs,endlessm/gjs,joeshaw/gjs,endlessm/gjs,mtwebster/cjs,magcius/gjs,djdeath/gjs,djdeath/gjs,magcius/gjs,joeshaw/gjs