Minor simplification due to removal of TextExtracts