#132013: small refactorings