GoTo commands now work with C-family macros

Fixes #758
Merged from master