cgltrace: Tweaks to CGL api support.