Yes, doing this as a merge into bzr itself would be better; we generally want a batteries-included approach unless there's a downside to including it. Martin