Avoid some unneeded querying in GAFFormatter