[GL] Simplify AF code