These imports of Some are not actually required, just inserted by IDEs occasionally. This is actually the only remaining usage in our code base, so let's have away with it!