Flatten more cases in all, isolate non-promise value case