pavo: clean everything a bit before writing the visitors (which will change the grammar a bit here and there)