cogl: Another round of cleanups

See commits for details

Merge request reports

Loading