Adjusting function signatures.

Sorry for the PR. I don't have push rights to your fork. I just gave you push rights to my fork. Maybe you can give me rights on yours? Might ease things for the future :-)