Refactorings to use the new utility classes in scaffoldx-api.