Added Policy as a template parameter to functors and #6934 test program now compiles and runs.
Need to commit changes to concept checks to confirm.