some goto declaration tweaks
Merge pull request #1754 from devoncarew/devoncarew_goto_dec

some goto declaration tweaks