issue #21605: Tweaks.
issue #21605: Clean up around edges on priv check.