Fix # todo: bad hacks

I've had problem keeping in mind which values I passed with type annotation, so now I had to write some code to check for it.

It should be removed.