Make `GetCurrentInstruction()` more robust

Getting context on the first line of a function would collect back until
the first ';' into previous functions (if they are empty) classnames
and such.
Merge branch 'master' into my-develop