parser cleanup, change uniop to unop