Remove dependencies on Promise convenience functions.