Restored Equals on Optional