Clean up column stats code a bit