Reduce indention for typically deep trees.
Remove unused includes.