Merge pull request #4218 from aldelaro5/debugger-stepping-fixes Fix a bunch of debugger stepping issues.
