automoc4: make this build again.