Some small refactorings due to arbitrary versions.