More thorough peer purging test, and tidy some style things