Don't shadow makeFunc
Make all user-facing funcs total