Since the return value of this function is slightly more involved than the void/bool/int/size_t return values we've seen so far, also refactor this.
