Move the collection set code out of the policy and into a G1CollectionSet class.
Most of the code related to the collection set operates on a limited set of member variables in the policy class, moving those members and associated methods to a separate class reduces the amount of code in the policy.