Rename some functions, and remove a duplicate definition of arc.
start pretty macros for semi-natural language