Get rid of unsafe variables.

2 jobs for fix/unsafe-variables in 4 minutes and 41 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Lint
passed #3276
lint

00:02:08

 
  Test
passed #3277
unit-testing

00:02:33