Highwater swapping mechanism to eliminate ComponentPool vector holes; further refinements