Simplify naturalCmp
Fix different token length logic in naturalCmp