More IText refactoring and minor group tweak