clean parser api
merge
a first fix for the top-level
#use ... now works