I want to change the API: do we want to save TreeWriter or change all callers?