Better, correcter function definitions

@gerbal, check this out and see if I've cleared things up.  Getting you commit access to this repo so you can merge my Pull request.  Be careful not to push commits directly to silshack! :)