Add more scana captures
There seems to be a bug in sample_val

sample_val won't return the correct value if it's before the current
transition. We capture the value as we are transitioning so we don't
have to use it.