Fix some nits with promise usage.