Shorten edge-adders, and reduce duplicate membership checks.