[genproj] Some hygiene changes to genproj, to be able to even digest this