... with a goal to remove the old code after the next snapshot. (Since we're still not backward-compatible, I think we should take the opportunity to make the code as nice as possible now, while we still don't have handle logging from legacy libs.)