This short series removes the remaining cleanups from the btrace code. It seemed simpler to review as two patches, which is why I've split it up. Tested by the buildbot. Tom