Rename currentTrace() to currentSpan(), fix up a couple potential NPEs