Make scrollPos a tuple again, rather than a list.
Remove hacks put in for ease of testing.