Make opt::flatten return reference options sometimes to make it mor…

Make opt::flatten return reference options sometimes to make it mor… #975