diff --git a/src/plugins/fossil/fossilclient.cpp b/src/plugins/fossil/fossilclient.cpp
index db75fbf9d1e..bb04dd43d5c 100644
--- a/src/plugins/fossil/fossilclient.cpp
+++ b/src/plugins/fossil/fossilclient.cpp
@@ -433,7 +433,7 @@ RepositorySettings FossilClient::synchronousSettingsQuery(const FilePath &workin
     RepositorySettings repoSettings;
     repoSettings.user = synchronousUserDefaultQuery(workingDirectory);
     if (repoSettings.user.isEmpty())
-        repoSettings.user = settings().userName.value();
+        repoSettings.user = settings().userName();
 
     for (const QString &line : output.split('\n', Qt::SkipEmptyParts)) {
         // parse settings line:
@@ -587,7 +587,7 @@ bool FossilClient::synchronousCreateRepository(const FilePath &workingDirectory,
 
     const QString repoName = workingDirectory.fileName().simplified();
     const FilePath repoPath = settings().defaultRepoPath();
-    const QString adminUser = settings().userName.value();
+    const QString adminUser = settings().userName();
 
     if (repoName.isEmpty() || repoPath.isEmpty())
         return false;
diff --git a/src/plugins/fossil/wizard/fossiljsextension.cpp b/src/plugins/fossil/wizard/fossiljsextension.cpp
index e37e13c644f..35d7a6fd36c 100644
--- a/src/plugins/fossil/wizard/fossiljsextension.cpp
+++ b/src/plugins/fossil/wizard/fossiljsextension.cpp
@@ -50,7 +50,7 @@ QString FossilJsExtension::defaultAdminUser() const
     if (!isConfigured())
         return QString();
 
-    return settings().userName.value();
+    return settings().userName();
 }
 
 QString FossilJsExtension::defaultSslIdentityFile() const
@@ -74,7 +74,7 @@ bool FossilJsExtension::defaultDisableAutosync() const
     if (!isConfigured())
         return false;
 
-    return settings().disableAutosync.value();
+    return settings().disableAutosync();
 }
 
 } // namespace Internal
diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp
index 857d3996a61..5720497ecae 100644
--- a/src/plugins/git/branchview.cpp
+++ b/src/plugins/git/branchview.cpp
@@ -115,7 +115,7 @@ BranchView::BranchView()
     connect(m_includeOldEntriesAction, &QAction::toggled,
             this, &BranchView::setIncludeOldEntries);
     m_includeTagsAction->setCheckable(true);
-    m_includeTagsAction->setChecked(settings().showTags.value());
+    m_includeTagsAction->setChecked(settings().showTags());
     connect(m_includeTagsAction, &QAction::toggled,
             this, &BranchView::setIncludeTags);
 
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 764feb0d08b..bd0b037cdaf 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2110,7 +2110,7 @@ Environment GitClient::processEnvironment() const
     Environment environment = VcsBaseClientImpl::processEnvironment();
     const FilePath gitPath = settings().path();
     environment.prependOrSetPath(gitPath);
-    if (HostOsInfo::isWindowsHost() && settings().winSetHomeEnvironment.value()) {
+    if (HostOsInfo::isWindowsHost() && settings().winSetHomeEnvironment()) {
         QString homePath;
         if (qtcEnvironmentVariableIsEmpty("HOMESHARE")) {
             homePath = QDir::toNativeSeparators(QDir::homePath());
@@ -2448,7 +2448,7 @@ void GitClient::tryLaunchingGitK(const Environment &env,
             binary = wish;
         }
     }
-    const QString gitkOpts = settings().gitkOptions.value();
+    const QString gitkOpts = settings().gitkOptions();
     if (!gitkOpts.isEmpty())
         arguments.append(ProcessArgs::splitArgs(gitkOpts, HostOsInfo::hostOs()));
     if (!fileName.isEmpty())
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index c7078dc2ba1..106cd585686 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -132,7 +132,7 @@ static QString sanitizeBlameOutput(const QString &b)
     if (b.isEmpty())
         return b;
 
-    const bool omitDate = settings().omitAnnotationDate.value();
+    const bool omitDate = settings().omitAnnotationDate();
     const QChar space(' ');
     const int parenPos = b.indexOf(')');
     if (parenPos == -1)
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 9ada18c1194..c7d2f1f0661 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1437,7 +1437,7 @@ void GitPluginPrivate::setupInstantBlame()
             return;
         }
 
-        if (!settings().instantBlame.value()) {
+        if (!settings().instantBlame()) {
             m_lastVisitedEditorLine = -1;
             stopInstantBlame();
             return;
@@ -1456,7 +1456,7 @@ void GitPluginPrivate::setupInstantBlame()
 
         m_blameCursorPosConn = connect(widget, &QPlainTextEdit::cursorPositionChanged, this,
                                 [this] {
-            if (!settings().instantBlame.value()) {
+            if (!settings().instantBlame()) {
                 disconnect(m_blameCursorPosConn);
                 return;
             }
@@ -1515,7 +1515,7 @@ CommitInfo parseBlameOutput(const QStringList &blame, const Utils::FilePath &fil
 
 void GitPluginPrivate::instantBlameOnce()
 {
-    if (!settings().instantBlame.value()) {
+    if (!settings().instantBlame()) {
         const TextEditorWidget *widget = TextEditorWidget::currentTextEditorWidget();
         if (!widget)
             return;
@@ -1725,7 +1725,7 @@ void GitPluginPrivate::pull()
     const VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return);
     FilePath topLevel = state.topLevel();
-    bool rebase = settings().pullRebase.value();
+    bool rebase = settings().pullRebase();
 
     if (!rebase) {
         QString currentBranch = m_gitClient.synchronousCurrentLocalBranch(topLevel);
diff --git a/src/plugins/gitlab/gitlaboptionspage.cpp b/src/plugins/gitlab/gitlaboptionspage.cpp
index 48ec0fda00d..bb471c5a414 100644
--- a/src/plugins/gitlab/gitlaboptionspage.cpp
+++ b/src/plugins/gitlab/gitlaboptionspage.cpp
@@ -69,19 +69,19 @@ GitLabServerWidget::GitLabServerWidget(Mode m, QWidget *parent)
     , m_mode(m)
 {
     m_host.setLabelText(Tr::tr("Host:"));
-    m_host.setDisplayStyle(m == Display ? Utils::StringAspect::LabelDisplay
-                                        : Utils::StringAspect::LineEditDisplay);
-    m_host.setValidationFunction([](Utils::FancyLineEdit *l, QString *) {
+    m_host.setDisplayStyle(m == Display ? StringAspect::LabelDisplay
+                                        : StringAspect::LineEditDisplay);
+    m_host.setValidationFunction([](FancyLineEdit *l, QString *) {
         return hostValid(l->text());
     });
 
     m_description.setLabelText(Tr::tr("Description:"));
-    m_description.setDisplayStyle(m == Display ? Utils::StringAspect::LabelDisplay
-                                               : Utils::StringAspect::LineEditDisplay);
+    m_description.setDisplayStyle(m == Display ? StringAspect::LabelDisplay
+                                               : StringAspect::LineEditDisplay);
 
     m_token.setLabelText(Tr::tr("Access token:"));
-    m_token.setDisplayStyle(m == Display ? Utils::StringAspect::LabelDisplay
-                                         : Utils::StringAspect::LineEditDisplay);
+    m_token.setDisplayStyle(m == Display ? StringAspect::LabelDisplay
+                                         : StringAspect::LineEditDisplay);
     m_token.setVisible(m == Edit);
 
     m_port.setLabelText(Tr::tr("Port:"));
@@ -89,7 +89,7 @@ GitLabServerWidget::GitLabServerWidget(Mode m, QWidget *parent)
     m_port.setValue(GitLabServer::defaultPort);
     m_port.setEnabled(m == Edit);
     m_secure.setLabelText(Tr::tr("HTTPS:"));
-    m_secure.setLabelPlacement(Utils::BoolAspect::LabelPlacement::InExtraLabel);
+    m_secure.setLabelPlacement(BoolAspect::LabelPlacement::InExtraLabel);
     m_secure.setDefaultValue(true);
     m_secure.setEnabled(m == Edit);
 
@@ -110,12 +110,12 @@ GitLabServerWidget::GitLabServerWidget(Mode m, QWidget *parent)
 GitLabServer GitLabServerWidget::gitLabServer() const
 {
     GitLabServer result;
-    result.id = m_mode == Edit ? Utils::Id::fromName(QUuid::createUuid().toByteArray()) : m_id;
-    result.host = m_host.value();
-    result.description = m_description.value();
-    result.token = m_token.value();
-    result.port = m_port.value();
-    result.secure = m_secure.value();
+    result.id = m_mode == Edit ? Id::fromName(QUuid::createUuid().toByteArray()) : m_id;
+    result.host = m_host();
+    result.description = m_description();
+    result.token = m_token();
+    result.port = m_port();
+    result.secure = m_secure();
     return result;
 }
 
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 5101d471591..2a9905a4c22 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1152,7 +1152,7 @@ bool PerforcePluginPrivate::vcsOpen(const FilePath &filePath)
 IVersionControl::SettingsFlags PerforcePluginPrivate::settingsFlags() const
 {
     SettingsFlags rc;
-    if (m_settings.autoOpen.value())
+    if (m_settings.autoOpen())
         rc |= AutoOpen;
     return rc;
 }
@@ -1689,7 +1689,7 @@ void PerforcePluginPrivate::slotTopLevelFailed(const QString &errorMessage)
 void PerforcePluginPrivate::getTopLevel(const FilePath &workingDirectory, bool isSync)
 {
     // Run a new checker
-    if (m_settings.p4BinaryPath.value().isEmpty())
+    if (m_settings.p4BinaryPath().isEmpty())
         return;
     auto checker = new PerforceChecker(dd);
     connect(checker, &PerforceChecker::failed, dd, &PerforcePluginPrivate::slotTopLevelFailed);
diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp
index 915c4777ddd..eba981115f5 100644
--- a/src/plugins/perforce/perforcesettings.cpp
+++ b/src/plugins/perforce/perforcesettings.cpp
@@ -149,13 +149,13 @@ PerforceSettings::~PerforceSettings()
 QStringList PerforceSettings::commonP4Arguments() const
 {
     QStringList lst;
-    if (customEnv.value()) {
-        if (!p4Client.value().isEmpty())
-            lst << "-c" << p4Client.value();
-        if (!p4Port.value().isEmpty())
-            lst << "-p" << p4Port.value();
-        if (!p4User.value().isEmpty())
-            lst << "-u" << p4User.value();
+    if (customEnv()) {
+        if (!p4Client().isEmpty())
+            lst << "-c" << p4Client();
+        if (!p4Port().isEmpty())
+            lst << "-p" << p4Port();
+        if (!p4User().isEmpty())
+            lst << "-u" << p4User();
     }
     return lst;
 }
@@ -179,7 +179,7 @@ QStringList PerforceSettings::commonP4Arguments_volatile() const
 
 bool PerforceSettings::isValid() const
 {
-    return !m_topLevel.isEmpty() && !p4BinaryPath.value().isEmpty();
+    return !m_topLevel.isEmpty() && !p4BinaryPath().isEmpty();
 }
 
 bool PerforceSettings::defaultEnv() const