[refactoring] some fixes of imports according to lsp suggestions

4 jobs for 169-dev-singulars-plurals in 135 minutes and 34 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Cabal
passed #12010
cabal

01:06:23

 
  Stack
passed #12011
stack

00:02:58

 
  Bench
manual #12012
allowed to fail manual
bench
 
  Test
passed #12013
test

01:06:12