well, the current code has it. So I kept it to be safe, just moving it after the place where I need to use the original value. Cleaning this would be left for a separate PR (I want to try cleaning some stuff in the driver but after merging this PR so that the testsuite is green before I start)