[NUCRDBMS-838] Some restructuring of ClassAdder to get rid of some small
methods so is much easier to follow and easier to identify the locking
used