Refactored tree definitions.