cluttermm: Split into two parallel-installable branches.