PrivacyGuard: fix some bracketing issues