[PATCH] Port rev-tree to parsing functions