Changed remaining inconsistent functions to take F# functions rather than Func<T>.