Cleanup and tested for int properties. Try to use small ints if possible.

Finding a unique int takes an order of magnitude longer (probably because int primary keys are built on top of string ones) but still under 1 ms.