Time-tree-input code reorg/cleanup