Improve Cogl module fixups.