From d2887819c09818c00e84c4bd6e0b8a876541c336 Mon Sep 17 00:00:00 2001
From: Pr0methean <seahen123@gmail.com>
Date: Tue, 10 Oct 2017 02:04:13 -0700
Subject: [PATCH] Remove Checker Framework

No timeline for JDK9 support: see
https://github.com/typetools/checker-framework/issues/1224
---
 .idea/workspace.xml                           | 399 ++++++++++--------
 betterrandom/pom.xml                          |  39 +-
 .../betterrandom/prng/AesCounterRandom.java   |  17 +-
 .../betterrandom/prng/BaseRandom.java         |  31 +-
 .../prng/CellularAutomatonRandom.java         |  17 +-
 .../betterrandom/prng/Cmwc4096Random.java     |  12 +-
 .../prng/MersenneTwisterRandom.java           |  15 +-
 .../betterrandom/prng/RandomWrapper.java      |   9 +-
 .../betterrandom/prng/XorShiftRandom.java     |   7 +-
 .../adapter/BaseSplittableRandomAdapter.java  |   6 +-
 .../DirectSplittableRandomAdapter.java        |   8 +-
 .../ReseedingSplittableRandomAdapter.java     |  17 +-
 .../prng/adapter/SplittableRandomAdapter.java |  17 +-
 .../betterrandom/seed/RandomSeederThread.java |  26 +-
 .../betterrandom/util/LogPreFormatter.java    |   6 +-
 .../betterrandom/util/LooperThread.java       |  29 +-
 .../AbstractSupplierSpliterator.java          |   5 +-
 .../spliterator/IntSupplierSpliterator.java   |   3 +-
 .../pr0methean/betterrandom/TestUtils.java    |   3 +-
 .../betterrandom/util/LooperThreadTest.java   |   4 +-
 .../main/java/WeakReferenceWithEquals.java    |   2 +-
 21 files changed, 305 insertions(+), 367 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 114793373..200373461 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8d34e3fe-111b-4f5b-b1bf-5875a1f8c255" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapterDemo.java" afterPath="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapterDemo.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/pom.xml" afterPath="$PROJECT_DIR$/betterrandom/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/CellularAutomatonRandom.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/CellularAutomatonRandom.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/MersenneTwisterRandom.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/MersenneTwisterRandom.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/RandomWrapper.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/RandomWrapper.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/XorShiftRandom.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/XorShiftRandom.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/BaseSplittableRandomAdapter.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/BaseSplittableRandomAdapter.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/DirectSplittableRandomAdapter.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/DirectSplittableRandomAdapter.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapter.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapter.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/SplittableRandomAdapter.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/SplittableRandomAdapter.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LogPreFormatter.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LogPreFormatter.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/AbstractSupplierSpliterator.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/AbstractSupplierSpliterator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/IntSupplierSpliterator.java" afterPath="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/IntSupplierSpliterator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/TestUtils.java" afterPath="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/TestUtils.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/util/LooperThreadTest.java" afterPath="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/util/LooperThreadTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cutting_room_floor/main/java/WeakReferenceWithEquals.java" afterPath="$PROJECT_DIR$/cutting_room_floor/main/java/WeakReferenceWithEquals.java" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -29,39 +49,95 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="ReseedingSplittableRandomAdapterDemo.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapterDemo.java">
+      <file leaf-file-name="LooperThread.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
+            <state relative-caret-position="200">
+              <caret line="10" column="59" lean-forward="false" selection-start-line="10" selection-start-column="59" selection-end-line="10" selection-end-column="59" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="RandomSeederThread.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="157">
+              <caret line="122" column="10" lean-forward="false" selection-start-line="122" selection-start-column="10" selection-end-line="122" selection-end-column="10" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BaseRandom.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-14588">
+              <caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+              <folding>
+                <element signature="e#29370#29423#0" expanded="true" />
+                <marker date="1507626062389" expanded="false" signature="25940:26012" ph="/ObjectEquality, EqualityOperatorComparesObjects/" />
+                <marker date="1507626062389" expanded="false" signature="28553:28618" ph="/OverriddenMethodCallDuringObjectConstruction/" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/betterrandom/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="277">
+              <caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AesCounterRandom.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1434">
+              <caret line="287" column="3" lean-forward="false" selection-start-line="287" selection-start-column="3" selection-end-line="287" selection-end-column="3" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#12505#12506#0" expanded="true" />
+                <element signature="e#12549#12550#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Cmwc4096Random.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1320">
+              <caret line="80" column="2" lean-forward="false" selection-start-line="80" selection-start-column="2" selection-end-line="80" selection-end-column="2" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#3484#3485#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Interface" />
-        <option value="AnnotationType" />
         <option value="TestNG Test Class" />
         <option value="package-info" />
         <option value="Enum" />
         <option value="Class" />
+        <option value="AnnotationType" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>(SeedGenerator</find>
-      <find>nextgauss</find>
-      <find>an imple</find>
-      <find>longs</find>
-      <find>nextdouble(</find>
-      <find>@author ubuntu</find>
-      <find>nextdouble(doub</find>
       <find>nextdouble</find>
       <find>@Entry</find>
       <find>LOG.</find>
@@ -85,12 +161,20 @@
       <find>testseed</find>
       <find>start</find>
       <find>uncaught</find>
+      <find>collections</find>
+      <find>null</find>
+      <find>import org.checkerframework.checker.nullness.qual.Nullable;</find>
+      <find>@Nullable</find>
+      <find>guarded</find>
+      <find>castnon</find>
+      <find>checker</find>
     </findStrings>
     <replaceStrings>
       <replace>timeOut = 1000</replace>
       <replace />
       <replace>Delegates to {@link</replace>
       <replace>}. */</replace>
+      <replace>import javax.annotation.Nullable;</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -102,6 +186,7 @@
     </option>
   </component>
   <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java" root0="SKIP_INSPECTION" />
     <setting file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java" root0="SKIP_INSPECTION" />
     <setting file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/BaseSplittableRandomAdapter.java" root0="SKIP_INSPECTION" />
     <setting file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java" root0="SKIP_INSPECTION" />
@@ -109,10 +194,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/MoreMath.java" />
-        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/package-info.java" />
-        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java" />
-        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/MersenneTwisterRandom.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/SecureRandomSeedGenerator.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/DirectSplittableRandomAdapter.java" />
@@ -151,15 +232,19 @@
         <option value="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/util/LooperThreadTest.java" />
         <option value="$PROJECT_DIR$/benchmark/src/main/java/io/github/pr0methean/betterrandom/benchmark/AbstractRandomBenchmark.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/prng/RandomTestUtils.java" />
-        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/prng/BaseRandomStaticTest.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/AbstractSupplierSpliterator.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/TestUtils.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/prng/BaseRandomTest.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LogPreFormatter.java" />
-        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java" />
         <option value="$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapterDemo.java" />
+        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/Nullable.java" />
+        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java" />
+        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java" />
+        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java" />
+        <option value="$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java" />
+        <option value="$PROJECT_DIR$/betterrandom/pom.xml" />
       </list>
     </option>
   </component>
@@ -170,7 +255,7 @@
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-9" />
     <option name="width" value="1280" />
     <option name="height" value="720" />
@@ -290,8 +375,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="Scratches" />
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -299,32 +385,6 @@
               <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
               <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
-              <item name="benchmark" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
-              <item name="benchmark" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
-              <item name="benchmark" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
-              <item name="benchmark" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
               <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
@@ -365,45 +425,20 @@
               <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
               <item name="betterrandom" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
-              <item name="betterrandom" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
-              <item name="betterrandom" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="betterrandom" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
-              <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
-              <item name="betterrandom" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="betterrandom" type="462c0819:PsiDirectoryNode" />
-              <item name="prng" type="462c0819:PsiDirectoryNode" />
+              <item name="seed" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
               <item name="BetterRandom" type="462c0819:PsiDirectoryNode" />
               <item name="betterrandom" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="betterrandom" type="462c0819:PsiDirectoryNode" />
-              <item name="prng" type="462c0819:PsiDirectoryNode" />
-              <item name="adapter" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="BetterRandom" type="b2602c69:ProjectViewProjectNode" />
@@ -523,7 +558,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -856,6 +890,20 @@
       <constraint name="__context__" target="true" within="" contains="" />
       <constraint name="prim" nameOfExprType="byte\[\]" within="" contains="" />
     </replaceConfiguration>
+    <replaceConfiguration name="user defined" created="1507625953875" text="castNonNull($ref$)" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" useStaticImport="true" replacement="$ref$" history="1">
+      <constraint name="ref" within="" contains="" />
+    </replaceConfiguration>
+    <replaceConfiguration name="user defined" created="1507625466726" text="@UnknownInitialization" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" useStaticImport="true" replacement="" history="1" />
+    <replaceConfiguration name="user defined" created="1507625450057" text="@UnderInitialization" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" useStaticImport="true" replacement="" history="1" />
+    <replaceConfiguration name="user defined" created="1507625070323" text="@RequiresNonNull" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" useStaticImport="true" replacement="" history="1" />
+    <replaceConfiguration name="user defined" created="1507625006946" text="@org.checkerframework.checker.nullness.qual.$clazz$" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" useStaticImport="true" replacement="" history="1">
+      <constraint name="clazz" within="" contains="" />
+    </replaceConfiguration>
+    <replaceConfiguration name="user defined" created="1507624992793" text="@org.checkerframework.checker.nullness.qual.*" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" useStaticImport="true" replacement="" history="1" />
+    <replaceConfiguration name="user defined" created="1507624922582" text="@EnsuresNonNull" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" useStaticImport="true" replacement="" history="1" />
+    <replaceConfiguration name="user defined" created="1507624912624" text="@EnsuresNonNull($param$)" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" useStaticImport="true" replacement="" history="1">
+      <constraint name="param" within="" contains="" />
+    </replaceConfiguration>
     <searchConfiguration name="user defined" created="1506973574376" text="SEED_SIZE_BYTES" recursive="false" caseInsensitive="true" type="JAVA" history="1">
       <constraint name="__context__" target="true" within="" contains="" />
     </searchConfiguration>
@@ -896,33 +944,6 @@
       <constraint name="ParameterType" within="" contains="" />
       <constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
     </searchConfiguration>
-    <searchConfiguration name="methods of the class" created="1503794427591" text="void readObject($ParameterType$ $Parameter$);" recursive="false" caseInsensitive="true" type="JAVA" history="1">
-      <constraint name="ParameterType" within="" contains="" />
-      <constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
-    </searchConfiguration>
-    <searchConfiguration name="user defined" created="1503793333280" text="@SuppressWarnings(&quot;$String$&quot;)" recursive="false" caseInsensitive="true" type="JAVA" history="1">
-      <constraint name="String" regexp="[a-z].*" within="" contains="" />
-      <constraint name="__context__" target="true" within="" contains="" />
-    </searchConfiguration>
-    <searchConfiguration name="string literals" created="1503793304666" text="@SuppressWarnings(&quot;$String$&quot;)" recursive="false" caseInsensitive="true" type="JAVA" history="1">
-      <constraint name="String" regexp="[a-z].*" within="" contains="" />
-      <constraint name="__context__" target="true" within="" contains="" />
-    </searchConfiguration>
-    <searchConfiguration name="user defined" created="1503793160455" text="@SuppressWarnings(&quot;[a-z].*&quot;)" recursive="true" caseInsensitive="true" type="JAVA" history="1">
-      <constraint name="__context__" target="true" within="string literals" contains="" />
-    </searchConfiguration>
-    <searchConfiguration name="user defined" created="1503793128632" text="@SuppressWarnings(&quot;[a-z].*&quot;)" recursive="true" caseInsensitive="true" type="JAVA" history="1">
-      <constraint name="__context__" nameOfExprType="[a-z].*" target="true" within="string literals" contains="" />
-    </searchConfiguration>
-    <searchConfiguration name="user defined" created="1503793116102" text="@SuppressWarnings({?&quot;[a-z].*&quot;}?)" recursive="true" caseInsensitive="true" type="JAVA" history="1">
-      <constraint name="__context__" nameOfExprType="[a-z].*" target="true" within="string literals" contains="" />
-    </searchConfiguration>
-    <searchConfiguration name="user defined" created="1503792959555" text="@SuppressWarnings([a-z].*)" recursive="true" caseInsensitive="true" type="JAVA" history="1">
-      <constraint name="__context__" target="true" within="" contains="" />
-    </searchConfiguration>
-    <searchConfiguration name="user defined" created="1503792927807" text="@SuppressWarnings(.*)" recursive="true" caseInsensitive="true" type="JAVA" history="1">
-      <constraint name="__context__" target="true" within="" contains="" />
-    </searchConfiguration>
   </component>
   <component name="StructureViewFactory">
     <option name="ACTIVE_ACTIONS" value=",ALPHA_COMPARATOR" />
@@ -979,12 +1000,11 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1384" height="738" extended-state="6" />
+    <frame x="-9" y="-9" width="1384" height="738" extended-state="7" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4403509" sideWeight="0.45718655" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4105263" sideWeight="0.44189602" order="10" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -992,7 +1012,7 @@
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.558104" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34327218" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3233945" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.51578945" sideWeight="0.496337" order="13" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.49082568" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3646789" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1007,6 +1027,7 @@
       <window_info id="Analyze Dataflow to" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.44983277" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2736842" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4403509" sideWeight="0.45718655" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
@@ -1063,7 +1084,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/util/LooperThreadTest.java</url>
-          <line>29</line>
+          <line>28</line>
           <properties />
           <option name="timeStamp" value="9" />
         </line-breakpoint>
@@ -1097,27 +1118,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/SecureRandomSeedGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="31" column="2" lean-forward="false" selection-start-line="31" selection-start-column="2" selection-end-line="31" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/SeedGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="21" column="23" lean-forward="false" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/logging/Logger.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
-          <caret line="923" column="16" lean-forward="false" selection-start-line="923" selection-start-column="16" selection-end-line="923" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/DevRandomSeedGenerator.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="140">
@@ -1143,7 +1143,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="9800">
           <caret line="520" column="28" lean-forward="false" selection-start-line="520" selection-start-column="28" selection-end-line="520" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1175,7 +1174,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="671" column="23" lean-forward="false" selection-start-line="671" selection-start-column="23" selection-end-line="671" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1321,14 +1319,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="45" column="13" lean-forward="false" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/EntryPoint.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="140">
@@ -1358,20 +1348,12 @@
         <state relative-caret-position="170">
           <caret line="23" column="9" lean-forward="false" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
           <folding>
-            <element signature="e#745#746#0" expanded="false" />
-            <element signature="e#766#767#0" expanded="false" />
+            <element signature="e#641#642#0" expanded="false" />
+            <element signature="e#662#663#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="70">
-          <caret line="103" column="0" lean-forward="false" selection-start-line="103" selection-start-column="0" selection-end-line="107" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/SingleThreadSplittableRandomAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="372">
@@ -1426,35 +1408,14 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="158" column="17" lean-forward="false" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
-          <folding>
-            <element signature="e#5836#5874#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/benchmark/src/main/java/io/github/pr0methean/betterrandom/benchmark/AbstractRandomBenchmark.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1440">
           <caret line="73" column="15" lean-forward="false" selection-start-line="73" selection-start-column="15" selection-end-line="73" selection-end-column="15" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#2479#2480#0" expanded="true" />
-            <element signature="e#2522#2523#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="77" column="19" lean-forward="false" selection-start-line="77" selection-start-column="19" selection-end-line="77" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#12353#12403#0" expanded="true" />
+            <element signature="imports" expanded="false" />
+            <element signature="e#2479#2480#0" expanded="false" />
+            <element signature="e#2522#2523#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1480,8 +1441,7 @@
         <state relative-caret-position="72">
           <caret line="39" column="2" lean-forward="false" selection-start-line="39" selection-start-column="2" selection-end-line="39" selection-end-column="2" />
           <folding>
-            <element signature="e#4883#4884#0" expanded="true" />
-            <element signature="e#4915#4916#0" expanded="true" />
+            <element signature="e#4885#4886#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1491,7 +1451,7 @@
         <state relative-caret-position="72">
           <caret line="47" column="36" lean-forward="false" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
           <folding>
-            <element signature="e#2205#2242#0" expanded="true" />
+            <element signature="e#2205#2242#0" expanded="false" />
             <element signature="method#testWithProbability#0;class#BaseRandomTest#0" expanded="false" />
             <marker date="1507523830169" expanded="true" signature="15287:15294" ph="{...}" />
           </folding>
@@ -1522,30 +1482,97 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapterDemo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="16" column="61" lean-forward="false" selection-start-line="16" selection-start-column="61" selection-end-line="16" selection-end-column="61" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/CellularAutomatonRandom.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="201" column="6" lean-forward="false" selection-start-line="201" selection-start-column="6" selection-end-line="201" selection-end-column="6" />
+        <state relative-caret-position="157">
+          <caret line="135" column="17" lean-forward="false" selection-start-line="135" selection-start-column="13" selection-end-line="135" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker/2.1.14/checker-2.1.14.jar!/javax/annotation/Nullable.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="13" column="18" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/Nullable.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="3" column="84" lean-forward="false" selection-start-line="3" selection-start-column="84" selection-end-line="3" selection-end-column="84" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="312">
-          <caret line="445" column="19" lean-forward="false" selection-start-line="445" selection-start-column="19" selection-end-line="445" selection-end-column="19" />
+        <state relative-caret-position="-14588">
+          <caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
           <folding>
-            <element signature="e#17325#17378#0" expanded="true" />
-            <marker date="1507523830024" expanded="false" signature="26423:26495" ph="/ObjectEquality, EqualityOperatorComparesObjects/" />
-            <marker date="1507523830024" expanded="false" signature="29322:29387" ph="/OverriddenMethodCallDuringObjectConstruction/" />
+            <element signature="e#29370#29423#0" expanded="true" />
+            <marker date="1507626062389" expanded="false" signature="25940:26012" ph="/ObjectEquality, EqualityOperatorComparesObjects/" />
+            <marker date="1507626062389" expanded="false" signature="28553:28618" ph="/OverriddenMethodCallDuringObjectConstruction/" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/betterrandom/src/test/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapterDemo.java">
+    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
+        <state relative-caret-position="200">
+          <caret line="10" column="59" lean-forward="false" selection-start-line="10" selection-start-column="59" selection-end-line="10" selection-end-column="59" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="122" column="10" lean-forward="false" selection-start-line="122" selection-start-column="10" selection-end-line="122" selection-end-column="10" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1320">
+          <caret line="80" column="2" lean-forward="false" selection-start-line="80" selection-start-column="2" selection-end-line="80" selection-end-column="2" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#3484#3485#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1434">
+          <caret line="287" column="3" lean-forward="false" selection-start-line="287" selection-start-column="3" selection-end-line="287" selection-end-column="3" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#12505#12506#0" expanded="true" />
+            <element signature="e#12549#12550#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/betterrandom/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="277">
+          <caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
           <folding />
         </state>
       </provider>
diff --git a/betterrandom/pom.xml b/betterrandom/pom.xml
index 1d1f9ccd0..85ed543ce 100644
--- a/betterrandom/pom.xml
+++ b/betterrandom/pom.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--suppress XmlHighlighting -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <prefix />
+    <prefix/>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <annotatedJdk>${org.checkerframework:jdk8:jar}</annotatedJdk>
     <github.global.server>github</github.global.server>
   </properties>
   <groupId>io.github.pr0methean.betterrandom</groupId>
@@ -49,6 +50,11 @@
   </distributionManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
+    </dependency>
     <dependency>
       <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-deploy-plugin -->
       <groupId>org.apache.maven.plugins</groupId>
@@ -75,21 +81,6 @@
       <version>3.6.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.checkerframework</groupId>
-      <artifactId>checker-qual</artifactId>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.checkerframework</groupId>
-      <artifactId>checker</artifactId>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.checkerframework</groupId>
-      <artifactId>jdk8</artifactId>
-      <version>2.2.1</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-deploy-plugin</artifactId>
@@ -121,7 +112,6 @@
             <subpackages>io.github.pr0methean</subpackages>
             <show>protected</show>
             <links>
-              <link>https://checkerframework.org/api</link>
               <link>https://docs.oracle.com/javase/8/docs/api</link>
               <link>https://google.github.io/guava/releases/19.0/api/docs</link>
             </links>
@@ -243,12 +233,6 @@
               <Xmaxerrs>10000</Xmaxerrs>
               <Xmaxwarns>10000</Xmaxwarns>
             </compilerArguments>
-            <!-- FIXME: Enable once all issues are fixed 
-            <annotationProcessors>
-              <annotationProcessor>org.checkerframework.checker.nullness.NullnessChecker
-              </annotationProcessor>
-            </annotationProcessors>
-            -->
             <compilerArgs>
               <arg>-Xbootclasspath/p:${annotatedJdk}</arg>
             </compilerArgs>
@@ -350,11 +334,6 @@
                 readResolve(); !static !transient &lt;fields&gt;; }
               </option>
 
-              <!-- Allow deletion of castNonNull -->
-              <option>-assumenosideeffects public class
-                org.checkerframework.checker.nullness.NullnessUtil
-              </option>
-
               <!-- Work around a MethodHandle.invokeExact signature-check issue -->
               <option>-dontwarn java.lang.invoke**</option>
 
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java
index f0701564d..cd9ec65ff 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/AesCounterRandom.java
@@ -15,8 +15,6 @@
 // ============================================================================
 package io.github.pr0methean.betterrandom.prng;
 
-import static org.checkerframework.checker.nullness.NullnessUtil.castNonNull;
-
 import com.google.common.base.MoreObjects.ToStringHelper;
 import io.github.pr0methean.betterrandom.seed.DefaultSeedGenerator;
 import io.github.pr0methean.betterrandom.seed.SeedException;
@@ -34,8 +32,6 @@
 import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
 
 /**
  * <p>Non-linear random number generator based on the AES block cipher in counter mode. Uses the
@@ -177,9 +173,8 @@ private void readObject(final ObjectInputStream in) throws IOException, ClassNot
   }
 
   @Override
-  @EnsuresNonNull({"counter", "counterInput", "cipher", "lock"})
   protected void initTransientFields(
-      @UnknownInitialization AesCounterRandom this) {
+      AesCounterRandom this) {
     super.initTransientFields();
     if (counter == null) {
       counter = new byte[COUNTER_SIZE_BYTES];
@@ -290,7 +285,6 @@ public void setSeed(final byte[] seed) {
     } catch (final NoSuchAlgorithmException e) {
       throw new RuntimeException(e);
     }
-    this.seed = castNonNull(this.seed);
   }
 
   /**
@@ -298,16 +292,15 @@ public void setSeed(final byte[] seed) {
    */
   @Override
   @SuppressWarnings("contracts.postcondition.not.satisfied")
-  public synchronized void setSeed(@UnknownInitialization(Random.class)AesCounterRandom this,
+  public synchronized void setSeed(AesCounterRandom this,
       final long seed) {
     if (superConstructorFinished) {
       super.setSeed(seed);
     }
   }
 
-  @EnsuresNonNull({"counter", "this.seed", "entropyBits"})
   @Override
-  protected void setSeedInternal(@UnknownInitialization(Random.class)AesCounterRandom this,
+  protected void setSeedInternal(AesCounterRandom this,
       final byte[] seed) {
     final int seedLength = seed.length;
     if ((seedLength < 16) || (seedLength > MAX_TOTAL_SEED_LENGTH_BYTES)) {
@@ -322,7 +315,7 @@ protected void setSeedInternal(@UnknownInitialization(Random.class)AesCounterRan
     counter = new byte[COUNTER_SIZE_BYTES];
     System.arraycopy(seed, keyLength, counter, 0, seedLength - keyLength);
     try {
-      castNonNull(cipher).init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, ALGORITHM));
+      cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, ALGORITHM));
     } catch (final InvalidKeyException e) {
       throw new RuntimeException("Invalid key: " + Arrays.toString(key), e);
     }
@@ -331,7 +324,7 @@ protected void setSeedInternal(@UnknownInitialization(Random.class)AesCounterRan
 
   /** Returns the longest supported seed length. */
   @Override
-  public int getNewSeedLength(@UnknownInitialization AesCounterRandom this) {
+  public int getNewSeedLength(AesCounterRandom this) {
     return MAX_TOTAL_SEED_LENGTH_BYTES;
   }
 }
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java
index 4ef05c1dc..a1b052b78 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/BaseRandom.java
@@ -1,7 +1,6 @@
 package io.github.pr0methean.betterrandom.prng;
 
 import static java.lang.Integer.toUnsignedLong;
-import static org.checkerframework.checker.nullness.NullnessUtil.castNonNull;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
@@ -33,10 +32,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 import java.util.stream.StreamSupport;
-import org.checkerframework.checker.initialization.qual.UnderInitialization;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Abstract {@link Random} with a seed field and an implementation of entropy counting.
@@ -104,7 +100,8 @@ protected BaseRandom(final int seedSizeBytes) throws SeedException {
    * @param seedLength The seed length in bytes.
    * @throws SeedException If there is a problem generating a seed.
    */
-  protected BaseRandom(final SeedGenerator seedGenerator, final int seedLength) throws SeedException {
+  protected BaseRandom(final SeedGenerator seedGenerator, final int seedLength)
+      throws SeedException {
     this(seedGenerator.generateSeed(seedLength));
     entropyBits = new AtomicLong(0);
   }
@@ -114,7 +111,6 @@ protected BaseRandom(final SeedGenerator seedGenerator, final int seedLength) th
    *
    * @param seed the seed.
    */
-  @EnsuresNonNull("this.seed")
   protected BaseRandom(final byte[] seed) {
     superConstructorFinished = true;
     if (seed == null) {
@@ -631,7 +627,6 @@ public byte[] getSeed() {
     }
   }
 
-  @EnsuresNonNull({"this.seed", "entropyBits"})
   @Override
   public void setSeed(final byte[] seed) {
     lock.lock();
@@ -650,9 +645,8 @@ public void setSeed(final byte[] seed) {
    * input with the existing seed as {@link java.security.SecureRandom#setSeed(long)} does.
    */
   @SuppressWarnings("method.invocation.invalid")
-  @EnsuresNonNull({"this.seed", "entropyBits"})
   @Override
-  public synchronized void setSeed(@UnknownInitialization(Random.class)BaseRandom this,
+  public synchronized void setSeed(BaseRandom this,
       final long seed) {
     final byte[] seedBytes = BinaryUtils.convertLongToBytes(seed);
     if (superConstructorFinished) {
@@ -703,8 +697,7 @@ public boolean preferSeedWithLong() {
    *
    * @param seed The new seed.
    */
-  @EnsuresNonNull({"this.seed", "entropyBits"})
-  protected void setSeedInternal(@UnknownInitialization(Random.class)BaseRandom this,
+  protected void setSeedInternal(BaseRandom this,
       final byte[] seed) {
     if (this.seed == null || this.seed.length != seed.length) {
       this.seed = seed.clone();
@@ -721,20 +714,18 @@ protected void setSeedInternal(@UnknownInitialization(Random.class)BaseRandom th
   /**
    * Called in constructor and readObject to initialize transient fields.
    */
-  @EnsuresNonNull("lock")
-  protected void initTransientFields(@UnknownInitialization BaseRandom this) {
+  protected void initTransientFields(BaseRandom this) {
     if (lock == null) {
       lock = new ReentrantLock();
     }
     superConstructorFinished = true;
   }
 
-  @EnsuresNonNull({"lock", "seed", "entropyBits"})
-  private void readObject(@UnderInitialization(BaseRandom.class)BaseRandom this,
+  private void readObject(BaseRandom this,
       final ObjectInputStream in) throws IOException, ClassNotFoundException {
     in.defaultReadObject();
     initTransientFields();
-    setSeedInternal(castNonNull(seed));
+    setSeedInternal(seed);
   }
 
   @Override
@@ -768,7 +759,6 @@ private void asyncReseedIfPossible() {
    *
    * @throws InvalidObjectException if the {@link DefaultSeedGenerator} fails.
    */
-  @EnsuresNonNull({"lock", "seed", "entropyBits"})
   @SuppressWarnings("OverriddenMethodCallDuringObjectConstruction")
   private void readObjectNoData() throws InvalidObjectException {
     LOG.warn("BaseRandom.readObjectNoData() invoked; using DefaultSeedGenerator");
@@ -789,8 +779,7 @@ private void readObjectNoData() throws InvalidObjectException {
    * subclasses that can't actually use an 8-byte seed. Also used in {@link #readObjectNoData()}.
    */
   @SuppressWarnings("LockAcquiredButNotSafelyReleased")
-  @EnsuresNonNull({"seed", "entropyBits"})
-  protected void fallbackSetSeed(@UnknownInitialization BaseRandom this) {
+  protected void fallbackSetSeed(BaseRandom this) {
     boolean locked = false;
     if (lock != null) {
       lock.lock();
@@ -815,5 +804,5 @@ protected void fallbackSetSeed(@UnknownInitialization BaseRandom this) {
   }
 
   @Override
-  public abstract int getNewSeedLength(@UnknownInitialization BaseRandom this);
+  public abstract int getNewSeedLength(BaseRandom this);
 }
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/CellularAutomatonRandom.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/CellularAutomatonRandom.java
index 103ea9c28..612aec921 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/CellularAutomatonRandom.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/CellularAutomatonRandom.java
@@ -23,10 +23,6 @@
 import io.github.pr0methean.betterrandom.seed.SeedGenerator;
 import io.github.pr0methean.betterrandom.util.BinaryUtils;
 import java.util.Arrays;
-import java.util.Random;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
-import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
 /**
  * Java port of the <a href="http://home.southernct.edu/~pasqualonia1/ca/report.html"
@@ -133,9 +129,7 @@ protected ToStringHelper addSubclassFields(final ToStringHelper original) {
         .add("currentCellIndex", currentCellIndex);
   }
 
-  @EnsuresNonNull("cells")
-  @RequiresNonNull("seed")
-  private void copySeedToCellsAndPreEvolve(@UnknownInitialization CellularAutomatonRandom this) {
+  private void copySeedToCellsAndPreEvolve(CellularAutomatonRandom this) {
     cells = new int[AUTOMATON_LENGTH];
     // Set initial cell states using seed.
     cells[AUTOMATON_LENGTH - 1] = seed[0] + 128;
@@ -158,8 +152,7 @@ private void copySeedToCellsAndPreEvolve(@UnknownInitialization CellularAutomato
     }
   }
 
-  @RequiresNonNull("cells")
-  private int internalNext(@UnknownInitialization CellularAutomatonRandom this, final int bits) {
+  private int internalNext(CellularAutomatonRandom this, final int bits) {
     // Set cell addresses using address of current cell.
     final int cellC = currentCellIndex - 1;
 
@@ -193,7 +186,7 @@ public int next(final int bits) {
   }
 
   @Override
-  public synchronized void setSeed(@UnknownInitialization(Random.class)CellularAutomatonRandom this,
+  public synchronized void setSeed(CellularAutomatonRandom this,
       final long seed) {
     final byte[] shortenedSeed = convertIntToBytes(((Long) seed).hashCode());
     if (superConstructorFinished) {
@@ -204,7 +197,7 @@ public synchronized void setSeed(@UnknownInitialization(Random.class)CellularAut
   }
 
   @Override
-  protected void setSeedInternal(@UnknownInitialization(Random.class)CellularAutomatonRandom this,
+  protected void setSeedInternal(CellularAutomatonRandom this,
       final byte[] seed) {
     if (seed.length != SEED_SIZE_BYTES) {
       throw new IllegalArgumentException("Cellular Automaton RNG requires a 32-bit (4-byte) seed.");
@@ -216,7 +209,7 @@ protected void setSeedInternal(@UnknownInitialization(Random.class)CellularAutom
 
   /** Returns the only supported seed length. */
   @Override
-  public int getNewSeedLength(@UnknownInitialization CellularAutomatonRandom this) {
+  public int getNewSeedLength(CellularAutomatonRandom this) {
     return SEED_SIZE_BYTES;
   }
 }
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java
index 3b1f3bf18..08f806a5c 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/Cmwc4096Random.java
@@ -15,8 +15,6 @@
 // ============================================================================
 package io.github.pr0methean.betterrandom.prng;
 
-import static org.checkerframework.checker.nullness.NullnessUtil.castNonNull;
-
 import com.google.common.base.MoreObjects.ToStringHelper;
 import io.github.pr0methean.betterrandom.seed.DefaultSeedGenerator;
 import io.github.pr0methean.betterrandom.seed.SeedException;
@@ -25,8 +23,6 @@
 import io.github.pr0methean.betterrandom.util.EntryPoint;
 import java.util.Arrays;
 import java.util.Random;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
 
 /**
  * <p>A Java version of George Marsaglia's <a href="http://school.anhb.uwa.edu.au/personalpages/kwessen/shared/Marsaglia03.html">Complementary
@@ -82,7 +78,6 @@ public Cmwc4096Random(final SeedGenerator seedGenerator) throws SeedException {
    */
   public Cmwc4096Random(final byte[] seed) {
     super(seed);
-    state = castNonNull(state);
   }
 
   @Override
@@ -102,14 +97,13 @@ public byte[] getSeed() {
    * @param seed ignored
    */
   @Override
-  public synchronized void setSeed(@UnknownInitialization(Random.class)Cmwc4096Random this,
+  public synchronized void setSeed(Cmwc4096Random this,
       final long seed) {
     fallbackSetSeed();
   }
 
-  @EnsuresNonNull({"this.seed", "state", "entropyBits"})
   @Override
-  protected void setSeedInternal(@UnknownInitialization(Random.class)Cmwc4096Random this,
+  protected void setSeedInternal(Cmwc4096Random this,
       final byte[] seed) {
     if ((seed == null) || (seed.length != SEED_SIZE_BYTES)) {
       throw new IllegalArgumentException("CMWC RNG requires 16kb of seed data.");
@@ -142,7 +136,7 @@ protected int next(final int bits) {
 
   /** Returns the only supported seed length. */
   @Override
-  public int getNewSeedLength(@UnknownInitialization Cmwc4096Random this) {
+  public int getNewSeedLength(Cmwc4096Random this) {
     return SEED_SIZE_BYTES;
   }
 }
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/MersenneTwisterRandom.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/MersenneTwisterRandom.java
index 0b2a23c07..f3d178957 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/MersenneTwisterRandom.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/MersenneTwisterRandom.java
@@ -15,8 +15,6 @@
 // ============================================================================
 package io.github.pr0methean.betterrandom.prng;
 
-import static org.checkerframework.checker.nullness.NullnessUtil.castNonNull;
-
 import com.google.common.base.MoreObjects.ToStringHelper;
 import io.github.pr0methean.betterrandom.seed.DefaultSeedGenerator;
 import io.github.pr0methean.betterrandom.seed.SeedException;
@@ -24,8 +22,6 @@
 import io.github.pr0methean.betterrandom.util.BinaryUtils;
 import java.util.Arrays;
 import java.util.Random;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
 
 /**
  * <p>Random number generator based on the <a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html"
@@ -84,7 +80,6 @@ public MersenneTwisterRandom() throws SeedException {
    */
   public MersenneTwisterRandom(final byte[] seed) {
     super(seed);
-    mt = castNonNull(mt);
   }
 
   /**
@@ -111,14 +106,13 @@ protected ToStringHelper addSubclassFields(final ToStringHelper original) {
    * @param seed ignored
    */
   @Override
-  public synchronized void setSeed(@UnknownInitialization(Random.class)MersenneTwisterRandom this,
+  public synchronized void setSeed(MersenneTwisterRandom this,
       final long seed) {
     fallbackSetSeed();
   }
 
   @Override
-  @EnsuresNonNull({"lock", "mt"})
-  protected void initTransientFields(@UnknownInitialization MersenneTwisterRandom this) {
+  protected void initTransientFields(MersenneTwisterRandom this) {
     super.initTransientFields();
     if (mt == null) {
       mt = new int[N];
@@ -127,11 +121,10 @@ protected void initTransientFields(@UnknownInitialization MersenneTwisterRandom
 
   @Override
   protected void setSeedInternal(
-      @UnknownInitialization(Random.class)MersenneTwisterRandom this, final byte[] seed) {
+      MersenneTwisterRandom this, final byte[] seed) {
     if ((seed == null) || (seed.length != SEED_SIZE_BYTES)) {
       throw new IllegalArgumentException("Mersenne Twister RNG requires a 128-bit (16-byte) seed.");
     }
-    mt = castNonNull(mt);
     super.setSeedInternal(seed);
     final int[] seedInts = BinaryUtils.convertBytesToInts(seed);
 
@@ -206,7 +199,7 @@ protected final int next(final int bits) {
 
   /** Returns the only supported seed length. */
   @Override
-  public int getNewSeedLength(@UnknownInitialization MersenneTwisterRandom this) {
+  public int getNewSeedLength(MersenneTwisterRandom this) {
     return SEED_SIZE_BYTES;
   }
 }
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/RandomWrapper.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/RandomWrapper.java
index 583ee8989..45c6967cc 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/RandomWrapper.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/RandomWrapper.java
@@ -26,8 +26,7 @@
 import io.github.pr0methean.betterrandom.util.EntryPoint;
 import java.security.SecureRandom;
 import java.util.Random;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * <p>Wraps any {@link Random} as a {@link RepeatableRandom} and {@link ByteArrayReseedableRandom}.
@@ -149,7 +148,7 @@ public void setWrapped(final Random wrapped) {
   }
 
   private void readEntropyOfWrapped(
-      @UnknownInitialization(BaseRandom.class)RandomWrapper this,
+      RandomWrapper this,
       final Random wrapped) {
     entropyBits.set((wrapped instanceof EntropyCountingRandom)
         ? ((EntropyCountingRandom) wrapped).getEntropyBits()
@@ -188,7 +187,7 @@ public byte[] getSeed() {
    */
   @SuppressWarnings("LockAcquiredButNotSafelyReleased")
   @Override
-  public void setSeedInternal(@UnknownInitialization(Random.class)RandomWrapper this,
+  public void setSeedInternal(RandomWrapper this,
       final byte[] seed) {
     if (seed == null) {
       throw new IllegalArgumentException("Seed must not be null");
@@ -243,7 +242,7 @@ public boolean preferSeedWithLong() {
   /** */
   @SuppressWarnings("LockAcquiredButNotSafelyReleased")
   @Override
-  public int getNewSeedLength(@UnknownInitialization RandomWrapper this) {
+  public int getNewSeedLength(RandomWrapper this) {
     boolean locked = false;
     if (lock != null) {
       lock.lock();
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/XorShiftRandom.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/XorShiftRandom.java
index ea44283c8..31fb07c48 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/XorShiftRandom.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/XorShiftRandom.java
@@ -21,7 +21,6 @@
 import io.github.pr0methean.betterrandom.seed.SeedGenerator;
 import io.github.pr0methean.betterrandom.util.BinaryUtils;
 import java.util.Random;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
 
 /**
  * <p>Very fast pseudo random number generator.  See <a href="http://school.anhb.uwa.edu.au/personalpages/kwessen/shared/Marsaglia03.html">this
@@ -93,13 +92,13 @@ protected ToStringHelper addSubclassFields(final ToStringHelper original) {
    * @param seed ignored
    */
   @Override
-  public synchronized void setSeed(@UnknownInitialization(Random.class)XorShiftRandom this,
+  public synchronized void setSeed(XorShiftRandom this,
       final long seed) {
     fallbackSetSeed();
   }
 
   @Override
-  protected void setSeedInternal(@UnknownInitialization(Random.class)XorShiftRandom this,
+  protected void setSeedInternal(XorShiftRandom this,
       final byte[] seed) {
     if (seed.length != SEED_SIZE_BYTES) {
       throw new IllegalArgumentException("XorShiftRandom requires a 20-byte seed");
@@ -131,7 +130,7 @@ protected int next(final int bits) {
   }
 
   @Override
-  public int getNewSeedLength(@UnknownInitialization XorShiftRandom this) {
+  public int getNewSeedLength(XorShiftRandom this) {
     return SEED_SIZE_BYTES;
   }
 }
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/BaseSplittableRandomAdapter.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/BaseSplittableRandomAdapter.java
index ef330d0ee..6f43210b8 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/BaseSplittableRandomAdapter.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/BaseSplittableRandomAdapter.java
@@ -1,10 +1,8 @@
 package io.github.pr0methean.betterrandom.prng.adapter;
 
 import io.github.pr0methean.betterrandom.prng.BaseRandom;
-import java.util.Random;
 import java.util.SplittableRandom;
 import java.util.function.DoubleSupplier;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
 
 /**
  * Abstract class for implementations of {@link BaseRandom} that wrap one or more {@link
@@ -36,7 +34,7 @@ public BaseSplittableRandomAdapter(final long seed) {
 
   @Override
   protected void setSeedInternal(
-      @UnknownInitialization(Random.class)BaseSplittableRandomAdapter this, final byte[] seed) {
+      BaseSplittableRandomAdapter this, final byte[] seed) {
     super.setSeedInternal(seed);
   }
 
@@ -192,7 +190,7 @@ public float nextFloat() {
 
   /** Returns the only supported seed length. */
   @Override
-  public int getNewSeedLength(@UnknownInitialization BaseSplittableRandomAdapter this) {
+  public int getNewSeedLength(BaseSplittableRandomAdapter this) {
     return Long.BYTES;
   }
 }
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/DirectSplittableRandomAdapter.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/DirectSplittableRandomAdapter.java
index d88c25f15..dc4d2fbbe 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/DirectSplittableRandomAdapter.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/DirectSplittableRandomAdapter.java
@@ -5,10 +5,7 @@
 import io.github.pr0methean.betterrandom.util.EntryPoint;
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.util.Random;
 import java.util.SplittableRandom;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
 
 /**
  * Abstract subclass of {@link BaseSplittableRandomAdapter} where {@link #setSeed(long)} and {@link
@@ -64,10 +61,9 @@ private void readObject(final ObjectInputStream in) throws IOException, ClassNot
   /**
    * Replaces {@link #underlying} with a new {@link SplittableRandom} that uses the given seed.
    */
-  @EnsuresNonNull({"this.seed", "underlying", "entropyBits"})
   @Override
   protected void setSeedInternal(
-      @UnknownInitialization(Random.class)DirectSplittableRandomAdapter this,
+      DirectSplittableRandomAdapter this,
       final byte[] seed) {
     if (seed.length != Long.BYTES) {
       throw new IllegalArgumentException("DirectSplittableRandomAdapter requires an 8-byte seed");
@@ -80,7 +76,7 @@ protected void setSeedInternal(
    * Replaces {@link #underlying} with a new {@link SplittableRandom} that uses the given seed.
    */
   @Override
-  public void setSeed(@UnknownInitialization DirectSplittableRandomAdapter this,
+  public void setSeed(DirectSplittableRandomAdapter this,
       final long seed) {
     super.setSeedInternal(BinaryUtils.convertLongToBytes(seed));
     underlying = new SplittableRandom(seed);
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapter.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapter.java
index 9a82de863..3127268bd 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapter.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/ReseedingSplittableRandomAdapter.java
@@ -1,7 +1,5 @@
 package io.github.pr0methean.betterrandom.prng.adapter;
 
-import static org.checkerframework.checker.nullness.NullnessUtil.castNonNull;
-
 import com.google.common.base.MoreObjects.ToStringHelper;
 import io.github.pr0methean.betterrandom.seed.DefaultSeedGenerator;
 import io.github.pr0methean.betterrandom.seed.RandomSeederThread;
@@ -14,9 +12,7 @@
 import java.util.SplittableRandom;
 import java.util.WeakHashMap;
 import java.util.concurrent.atomic.AtomicLong;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Like {@link SplittableRandomAdapter}, but uses a {@link RandomSeederThread} to replace each
@@ -112,25 +108,24 @@ private ReseedingSplittableRandomAdapter readResolve() throws IOException {
     }
   }
 
-  @EnsuresNonNull({"threadLocal", "seederThread"})
   private void initSubclassTransientFields(
-      @UnknownInitialization(BaseSplittableRandomAdapter.class)ReseedingSplittableRandomAdapter this) {
+      ReseedingSplittableRandomAdapter this) {
     if (threadLocal == null) {
       threadLocal = ThreadLocal.withInitial(() -> {
         try {
-          return new SingleThreadSplittableRandomAdapter(castNonNull(seedGenerator));
+          return new SingleThreadSplittableRandomAdapter(seedGenerator);
         } catch (final SeedException e) {
           throw new RuntimeException(e);
         }
       });
     }
-    seederThread.set(RandomSeederThread.getInstance(castNonNull(seedGenerator)));
+    seederThread.set(RandomSeederThread.getInstance(seedGenerator));
   }
 
   @Override
   protected SplittableRandom getSplittableRandom() {
     final SingleThreadSplittableRandomAdapter adapterForThread = threadLocal.get();
-    castNonNull(seederThread.get()).add(adapterForThread);
+    seederThread.get().add(adapterForThread);
     return adapterForThread.getSplittableRandom();
   }
 
@@ -142,7 +137,7 @@ public boolean equals(final @Nullable Object o) {
   }
 
   @Override
-  protected void setSeedInternal(@UnknownInitialization ReseedingSplittableRandomAdapter this,
+  protected void setSeedInternal(ReseedingSplittableRandomAdapter this,
       final byte[] seed) {
     this.seed = seed.clone();
     if (entropyBits == null) {
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/SplittableRandomAdapter.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/SplittableRandomAdapter.java
index 8d0c3dd05..807ef0c28 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/SplittableRandomAdapter.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/prng/adapter/SplittableRandomAdapter.java
@@ -1,7 +1,6 @@
 package io.github.pr0methean.betterrandom.prng.adapter;
 
 import static io.github.pr0methean.betterrandom.util.BinaryUtils.convertBytesToLong;
-import static org.checkerframework.checker.nullness.NullnessUtil.castNonNull;
 
 import com.google.common.base.MoreObjects.ToStringHelper;
 import io.github.pr0methean.betterrandom.seed.DefaultSeedGenerator;
@@ -12,9 +11,6 @@
 import java.io.ObjectInputStream;
 import java.util.SplittableRandom;
 import java.util.concurrent.atomic.AtomicLong;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
-import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
 /**
  * Thread-safe PRNG that wraps a {@link ThreadLocal}&lt;{@link SplittableRandom}&gt;. Reseeding this
@@ -79,8 +75,6 @@ public SplittableRandomAdapter(final long seed) {
 
   private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
     in.defaultReadObject();
-    lock = castNonNull(lock);
-    underlying = castNonNull(underlying);
     initSubclassTransientFields();
   }
 
@@ -95,10 +89,8 @@ protected void recordEntropySpent(final long bits) {
     entropyBits.get().addAndGet(-bits);
   }
 
-  @EnsuresNonNull({"splittableRandoms", "entropyBits", "seeds"})
-  @RequiresNonNull({"lock", "underlying"})
   private void initSubclassTransientFields(
-      @UnknownInitialization(BaseSplittableRandomAdapter.class)SplittableRandomAdapter this) {
+      SplittableRandomAdapter this) {
     lock.lock();
     try {
       splittableRandoms = ThreadLocal.withInitial(underlying::split);
@@ -110,9 +102,6 @@ private void initSubclassTransientFields(
       lock.unlock();
     }
     // WTF Checker Framework? Why is this needed?
-    splittableRandoms = castNonNull(splittableRandoms);
-    entropyBits = castNonNull(entropyBits);
-    seeds = castNonNull(seeds);
   }
 
   @Override
@@ -134,7 +123,7 @@ public byte[] getSeed() {
    * {@inheritDoc} Applies only to the calling thread.
    */
   @Override
-  public void setSeed(@UnknownInitialization SplittableRandomAdapter this, final byte[] seed) {
+  public void setSeed(SplittableRandomAdapter this, final byte[] seed) {
     if (seed.length != Long.BYTES) {
       throw new IllegalArgumentException("SplittableRandomAdapter requires an 8-byte seed");
     }
@@ -146,7 +135,7 @@ public void setSeed(@UnknownInitialization SplittableRandomAdapter this, final b
    */
   @SuppressWarnings("contracts.postcondition.not.satisfied")
   @Override
-  public void setSeed(@UnknownInitialization SplittableRandomAdapter this,
+  public void setSeed(SplittableRandomAdapter this,
       final long seed) {
     if (this.seed == null) {
       super.setSeed(seed);
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java
index 5b6555f31..a0fc64e95 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/seed/RandomSeederThread.java
@@ -1,7 +1,5 @@
 package io.github.pr0methean.betterrandom.seed;
 
-import static org.checkerframework.checker.nullness.NullnessUtil.castNonNull;
-
 import io.github.pr0methean.betterrandom.ByteArrayReseedableRandom;
 import io.github.pr0methean.betterrandom.EntropyCountingRandom;
 import io.github.pr0methean.betterrandom.util.LogPreFormatter;
@@ -22,10 +20,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.locks.Condition;
 import java.util.logging.Level;
-import org.checkerframework.checker.initialization.qual.UnderInitialization;
-import org.checkerframework.checker.lock.qual.GuardedBy;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
-import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
 /**
  * Thread that loops over {@link Random} instances and reseeds them. No {@link
@@ -39,17 +33,17 @@ public final class RandomSeederThread extends LooperThread {
   private static final ExecutorService WAKER_UPPER = Executors.newSingleThreadExecutor();
   private static final LogPreFormatter LOG = new LogPreFormatter(RandomSeederThread.class);
   @SuppressWarnings("StaticCollection")
-  private static final @GuardedBy("<self>") Map<SeedGenerator, RandomSeederThread> INSTANCES =
+  private static final Map<SeedGenerator, RandomSeederThread> INSTANCES =
       Collections.synchronizedMap(new WeakHashMap<>(1));
   private static final long serialVersionUID = 5229976461051217528L;
   private final SeedGenerator seedGenerator;
   private final byte[] longSeedArray = new byte[8];
   // WeakHashMap-based Set can't be serialized, so read & write this copy instead
   private final Set<Random> prngsSerial = new HashSet<>();
-  private transient @GuardedBy("<self>") Set<Random> prngs;
+  private transient Set<Random> prngs;
   private transient ByteBuffer longSeedBuffer;
-  private transient @GuardedBy("lock") Condition waitWhileEmpty;
-  private transient @GuardedBy("lock") Condition waitForEntropyDrain;
+  private transient Condition waitWhileEmpty;
+  private transient Condition waitForEntropyDrain;
   private transient Set<Random> prngsThisIteration;
   private transient WeakHashMap<ByteArrayReseedableRandom, byte[]> seedArrays;
 
@@ -103,11 +97,7 @@ public static void stopAllEmpty() {
     }
   }
 
-  @EnsuresNonNull(
-      {"prngs", "seedArrays", "waitWhileEmpty",
-          "waitForEntropyDrain", "prngsThisIteration"})
-  @RequiresNonNull("lock")
-  private void initTransientFields(@UnderInitialization RandomSeederThread this) {
+  private void initTransientFields(RandomSeederThread this) {
     prngs = Collections.synchronizedSet(
         Collections.newSetFromMap(new WeakHashMap<>(1)));
     longSeedBuffer = ByteBuffer.wrap(longSeedArray);
@@ -122,7 +112,7 @@ protected Object readResolve() {
     return getInstance(seedGenerator);
   }
 
-  private void readObject(@UnderInitialization RandomSeederThread this, final ObjectInputStream in)
+  private void readObject(RandomSeederThread this, final ObjectInputStream in)
       throws IOException, ClassNotFoundException {
     in.defaultReadObject();
     initTransientFields();
@@ -130,11 +120,11 @@ private void readObject(@UnderInitialization RandomSeederThread this, final Obje
       synchronized (prngs) {
         prngs.addAll(prngsSerial);
       }
-      castNonNull(lock).lock();
+      lock.lock();
       try {
         waitWhileEmpty.signalAll();
       } finally {
-        castNonNull(lock).unlock();
+        lock.unlock();
       }
       prngsSerial.clear();
     }
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LogPreFormatter.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LogPreFormatter.java
index f018d3061..5e8ef9117 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LogPreFormatter.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LogPreFormatter.java
@@ -27,7 +27,8 @@ public LogPreFormatter(final Class<?> clazz) {
   private void format(final Level level, final int depthFromRealSource, final String formatString,
       final Object... args) {
     if (logger.isLoggable(level)) {
-      final StackTraceElement realSource = Thread.currentThread().getStackTrace()[depthFromRealSource];
+      final StackTraceElement realSource = Thread.currentThread()
+          .getStackTrace()[depthFromRealSource];
       logger.logp(level, realSource.getClassName(), realSource.getMethodName(),
           String.format(formatString, (Object[]) args));
     }
@@ -71,7 +72,8 @@ public void info(final String formatString, final Object... args) {
    */
   public void logStackTrace(final Level level, final StackTraceElement[] stackTrace) {
     if (logger.isLoggable(level)) {
-      final StringBuilder stackTraceBuilder = new StringBuilder(stackTrace.length * ESTIMATED_STE_SIZE);
+      final StringBuilder stackTraceBuilder = new StringBuilder(
+          stackTrace.length * ESTIMATED_STE_SIZE);
       for (final StackTraceElement element : stackTrace) {
         stackTraceBuilder.append(String.format("  %s%n", element));
       }
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java
index 07b6ed5fb..f9f64ff5e 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/LooperThread.java
@@ -1,7 +1,5 @@
 package io.github.pr0methean.betterrandom.util;
 
-import static org.checkerframework.checker.nullness.NullnessUtil.castNonNull;
-
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
@@ -9,10 +7,8 @@
 import java.io.Serializable;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
-import org.checkerframework.checker.initialization.qual.UnderInitialization;
+import javax.annotation.Nullable;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
 /**
  * <p>Thread that loops a given task until interrupted (or until JVM shutdown, if it {@link
@@ -55,11 +51,13 @@ public class LooperThread extends Thread implements Serializable, Cloneable {
   /**
    * The {@link ThreadGroup} this thread belongs to, if any. Held for serialization purposes.
    */
-  protected @Nullable ThreadGroup serialGroup;
+  protected @Nullable
+  ThreadGroup serialGroup;
   /**
    * The {@link Runnable} that was passed into this thread's constructor, if any.
    */
-  protected transient @Nullable Runnable target;
+  protected transient @Nullable
+  Runnable target;
   /**
    * The name of this thread, if it has a non-default name. Held for serialization purposes.
    */
@@ -70,9 +68,12 @@ public class LooperThread extends Thread implements Serializable, Cloneable {
   private boolean daemon = false;
   private int priority = Thread.NORM_PRIORITY;
   private State state = State.NEW;
-  private @Nullable ClassLoader contextClassLoader = null;
-  private @Nullable Runnable serialTarget;
-  private @Nullable UncaughtExceptionHandler serialUncaughtExceptionHandler;
+  private @Nullable
+  ClassLoader contextClassLoader = null;
+  private @Nullable
+  Runnable serialTarget;
+  private @Nullable
+  UncaughtExceptionHandler serialUncaughtExceptionHandler;
 
   /**
    * Constructs a LooperThread with all properties as defaults. Protected because it does not set a
@@ -193,14 +194,15 @@ public LooperThread(final ThreadGroup group, final @Nullable Runnable target, fi
     this.stackSize = stackSize;
   }
 
-  private static @Nullable <T> T serializableOrNull(final @Nullable T object) {
+  private static @Nullable
+  <T> T serializableOrNull(final @Nullable T object) {
     if (!(object instanceof Serializable)) {
       return null;
     }
     return object;
   }
 
-  private void setGroup(@UnderInitialization LooperThread this,
+  private void setGroup(LooperThread this,
       final @Nullable ThreadGroup group) {
     serialGroup = (group instanceof Serializable) ? group : null;
   }
@@ -235,7 +237,7 @@ protected Object readResolve()
       target = new DummyTarget();
     }
     if (serialGroup == null) {
-      serialGroup = castNonNull(Thread.currentThread().getThreadGroup());
+      serialGroup = currentThread().getThreadGroup();
     }
     final LooperThread t = readResolveConstructorWrapper();
     t.setDaemon(daemon);
@@ -278,7 +280,6 @@ protected Object readResolve()
    * @return the new LooperThread.
    * @throws InvalidObjectException if this LooperThread's serial form is invalid.
    */
-  @RequiresNonNull({"serialGroup", "name"})
   protected LooperThread readResolveConstructorWrapper()
       throws InvalidObjectException {
     return new LooperThread(serialGroup, target, name, stackSize);
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/AbstractSupplierSpliterator.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/AbstractSupplierSpliterator.java
index fd048cde4..6152ea4c4 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/AbstractSupplierSpliterator.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/AbstractSupplierSpliterator.java
@@ -7,7 +7,7 @@
 import java.util.Spliterator;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * An unordered, concurrent spliterator (possibly unboxed) that invokes a supplier (possibly
@@ -70,7 +70,8 @@ protected AbstractSupplierSpliterator(final AtomicLong remaining,
    * @see Spliterator#trySplit()
    */
   @SuppressWarnings("override.return.invalid") // actually is nullable in the interface
-  public @Nullable TSplitInto trySplit() {
+  public @Nullable
+  TSplitInto trySplit() {
     if ((splitsRemaining.getAndDecrement() <= 0) || (remaining.get() <= 0)) {
       return null;
     } else {
diff --git a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/IntSupplierSpliterator.java b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/IntSupplierSpliterator.java
index 97f57fa1c..bf0b080b8 100644
--- a/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/IntSupplierSpliterator.java
+++ b/betterrandom/src/main/java/io/github/pr0methean/betterrandom/util/spliterator/IntSupplierSpliterator.java
@@ -32,7 +32,8 @@ private IntSupplierSpliterator(final AtomicLong remaining, final AtomicLong spli
   }
 
   @Override
-  protected IntSupplierSpliterator internalSplit(final AtomicLong remaining, final AtomicLong splitsRemaining) {
+  protected IntSupplierSpliterator internalSplit(final AtomicLong remaining,
+      final AtomicLong splitsRemaining) {
     return new IntSupplierSpliterator(remaining, splitsRemaining, supplier);
   }
 
diff --git a/betterrandom/src/test/java/io/github/pr0methean/betterrandom/TestUtils.java b/betterrandom/src/test/java/io/github/pr0methean/betterrandom/TestUtils.java
index e283d997e..cd8047ebe 100644
--- a/betterrandom/src/test/java/io/github/pr0methean/betterrandom/TestUtils.java
+++ b/betterrandom/src/test/java/io/github/pr0methean/betterrandom/TestUtils.java
@@ -22,7 +22,8 @@ public enum TestUtils {
    * @param test The consumer to pass the instances to.
    * @param <T> {@code clazz} as a type.
    */
-  public static <T> void testAllPublicConstructors(final Class<T> clazz, final Map<Class<?>, Object> params,
+  public static <T> void testAllPublicConstructors(final Class<T> clazz,
+      final Map<Class<?>, Object> params,
       final Consumer<T> test) {
     for (final Constructor<?> constructor : clazz.getDeclaredConstructors()) {
       if (Modifier.isPublic(constructor.getModifiers())) {
diff --git a/betterrandom/src/test/java/io/github/pr0methean/betterrandom/util/LooperThreadTest.java b/betterrandom/src/test/java/io/github/pr0methean/betterrandom/util/LooperThreadTest.java
index c1ff8eac4..668640613 100644
--- a/betterrandom/src/test/java/io/github/pr0methean/betterrandom/util/LooperThreadTest.java
+++ b/betterrandom/src/test/java/io/github/pr0methean/betterrandom/util/LooperThreadTest.java
@@ -19,8 +19,7 @@
 import java.net.MalformedURLException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.checkerframework.checker.nullness.qual.RequiresNonNull;
+import javax.annotation.Nullable;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -227,7 +226,6 @@ public SkeletonLooperThread(final ThreadGroup group, final Runnable target, fina
       super(group, target, name, stackSize);
     }
 
-    @RequiresNonNull({"serialGroup", "target", "name"})
     @Override
     protected LooperThread readResolveConstructorWrapper() throws InvalidObjectException {
       return new SkeletonLooperThread(serialGroup, target, name, stackSize);
diff --git a/cutting_room_floor/main/java/WeakReferenceWithEquals.java b/cutting_room_floor/main/java/WeakReferenceWithEquals.java
index 075e4275a..424e17b8b 100644
--- a/cutting_room_floor/main/java/WeakReferenceWithEquals.java
+++ b/cutting_room_floor/main/java/WeakReferenceWithEquals.java
@@ -2,7 +2,7 @@
 
 import java.lang.ref.WeakReference;
 import java.util.Objects;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * A {@link WeakReference}&lt;T&gt; that compares the object it refers to when implementing {@link