Some small optimizations (helping type inference, avoid eager int to string conversion)

Some small optimizations (helping type inference, avoid eager int to string conversion) #307