Making BitSet APIs more consistent and minor formatting changes