[NUCRDBMS-763] Move more code into SchemaHandler. More to do still