Fix building with ENABLE_DEBUG_PRINTF

Clang tells me that "token pasting of ',' and __VA_ARGS__ is a GNU
extension".  Also catch up with changes in function args.