Normalize function signatures taking Function then