Minor refactorings for Raptor