This change set has the PropertyExpander that I wrote this morning.  We shouldn't duplicate this functionality here.