Tweak statement order
Bump version and changelog to 0.8.2