Updated builder to match SpokenCompiler refactoring.