first pass at refactoring FarPatchTables