cmake+lit: final cleanup related to the recent churn