refactor expansion uniqueness

per @namin's suggestion