Minor refactorings

Nothing to test here?