Clean up various return values to fulfill promises.