Finish PermQuery removal, fix derp.