Fix clang tidy complaints re mismatched prototypes