0.17: refactorings