See #19. Improve use of PromiseKit promises by removing unnecessary nested promises.