Fix errors warned by staticcheck

[mi-hayakata]

Background

I found the code that was getting warnings from staticcheck, so I fixed them.