disentanglement is correct by putting all the UnicodeSet virtual functions are in one file. Also move some of the rule whitespace handling into better locations. X-SVN-Rev: 16519
X-SVN-Rev: 16212