Remove extra parens from function defines
Add completion