Fix type in *-from fns.