Made function argument function types consistent

This commit cleans up some inconsistencies with mixed usages of Func<T> and F# functions as function arguments.