upgrade to peep 0.8, r=ErikRose