Update for recent refactorings so that adlc compiles