Rewrote a method to be more straightforward.
Move some protected utility methods up to PropertyEditor.

Cut down on duplication. This is related to another change
that's not ready yet but I brought some of it over with the
Border stuff and this was another nice chunk that is an improvement.