Making nice. Refactoring. Steps towards 3.4 compatibility