Agreed. A hard nut to break however. My proposal is leaving it as it is and fixing it cleanly with #541 lateron