Removed a couple of function return types.

Removed a couple of function return types because they could return a
promise or a value.