Revert "Use a function_ref now that it works (r221753)."

This reverts commit r221756.

David Blaikie pointed out it was unsafe.
Don't duplicate name in comments. NFC.
Fix non-variadic function_ref cases to match r221753
clang-format a few lines, fixes one 80col violation. nfc.