Was going to code a feature but forgor it already existed so I just cleaned up some Dirty / EntityQuery<T> stuff.