gl: Add/fix various annotations