   @inlinable
   @inline(__always)
   internal static func wordCount(forCapacity capacity: Int) -> Int {
-    return (capacity + Word.capacity - 1) &>> Word.shift
+    return word(for: capacity + Word.capacity - 1)
   }
 
   @inlinable
   internal var capacity: Int {
     @inline(__always)
     get {
-      return wordCount &<< Word.shift
+      return wordCount * Word.capacity
     }
   }
 

  @inline(__always)
  internal static func word(for element: Int) -> Int {
    _sanityCheck(element >= 0)
    return element &>> Word.shift
  }

  @inlinable

    // Note: We perform on UInts to get faster unsigned math (masking).
    let element = UInt(bitPattern: element)
    let capacity = UInt(bitPattern: Word.capacity)
    return Int(bitPattern: element % capacity)
  }

  @inlinable
