Use an inlined helper function instead.

Also clang-format affected files.

Fixes #23