Fix -Yno-adapted-args compiler warnings
Merge pull request #110 from fthomas/no-adapted-args

Fix -Yno-adapted-args compiler warnings