syntax & expr cleanup