more direct code
parse simple queries as well as programs
extract mk_calls
parse compound queries