Rewrote some manual tree building to quasiquotes