Code clean-up for the propertygrid package.