fix the start-of-function thing, and remove some debugging comments
Merge remote branch 'origin/4.01-perf-annotate' into 4.01-perf-annotate