reorganize TDL parser a little bit