Re-arranging some misuses of promises