diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 500dd559d..af0eb2640 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -18,15 +18,6 @@
-
-
-
-
-
-
-
-
-
@@ -56,6 +47,10 @@
+
+
+
+
@@ -86,14 +81,7 @@
-
+
@@ -143,9 +131,14 @@
-
+
+
+
+
+
+
@@ -202,10 +195,6 @@
-
-
-
-
@@ -362,7 +351,7 @@
-
+
@@ -371,6 +360,7 @@
+
@@ -378,11 +368,11 @@
-
+
-
+
@@ -400,12 +390,11 @@
-
+
-
@@ -436,11 +425,8 @@
-
-
-
diff --git a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
index f2990d969..cd9ac9c75 100644
--- a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
+++ b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
@@ -8,9 +8,9 @@ org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=;
org.eclipse.jdt.ui.javadoc=false
org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.ondemandthreshold=999
org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=999
org.eclipse.jdt.ui.text.custom_code_templates=/**\n * @return the ${bare_field_name}\n *//**\n * @param ${param} the ${bare_field_name} to set\n *//**\n * ${tags}\n *//**\n * ${tags}\n *//**\n * ${tags}\n *//* (non-Javadoc)\n * ${see_to_overridden}\n *//**\n * ${tags}\n * ${see_to_target}\n *//*\n * (c) Copyright ${year} Palantir Technologies Inc. All rights reserved.\n */\n\n${package_declaration}\n\n/**\n * \n */\n${typecomment}\n${type_declaration}\n\n\n\nthrow new RuntimeException(${exception_var});${body_statement}${body_statement}return ${field};${field} \= ${param};
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
index 9aa48633a..f41e2b8aa 100644
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -16,7 +16,7 @@
-
+
@@ -30,9 +30,10 @@
+
-
-
+
+
@@ -43,6 +44,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,7 +68,7 @@
-
+