[FOLD] Properly track peers and ensure postconditions hold