Fix excessive format check memory usage/slowdown