Fix warning about snake case function

This pull request is based on my other pull request, #164 (for the simple reason that it wouldn't have compiled otherwise). Only the third commit ("Fix snake case compiler warning") is actually relevant to this PR.