Got rid of unnecessary when_all() calls