de-bundle various recent additions