[SROA] Cleanup - remove the use of std::mem_fun_ref nonsense and use
a lambda now that we have them.