Small cleanups, simplification and removed no longer needed cast

Removed some of the parameter bookkeeping.
Removed apparently no longer needed cast to string. What changed with types ?
The tests runs a few seconds faster on my laptop.
Tested with the ORM.