Use new API for caller-side instrumentation, too.

This is the last reference to a lot of old code.
Trivial: whitespace.