Moved Optional to new library: base.