Add expansion callsite to the end of the stacktrace, closes #1426