Optional arguments should be defined at end
Rename one of our operator functions, and fix docblock