reorder invariant and adapt proof
reorder arguments of peek and poke
Merge branch 'master' into bitpos