[gl] Improve rules