CORE-5386 Finished separate file table conversions.