General code cleanup inside treewriter-related files.

Change-Id: Ifaa40612a9c054d96112ba350c6f4adb46b1bd5b
5 files changed