Minor refactoring of handling of root name, to cache PropertyName