Clean up the property system a bit. Try to improve loading/saving performance.