These are needed for correctness. There's no reason to only add them for function pointers. closes #16290