Minor optimizations in NodePropertiesTools