Fixed compile bug introduced yesterday

Forgot that I *was* actually using flatMapAsValue in the new code.
Re-added that, I believe in corrected form.