Slightly simplify/optimize columns collation