update optional<> to N3672 spec, including "in_place" rather than "emplace"