Tighten up some type arguments to functions. Where we expect a