Rewrote _refs to use new style

This required using if in a for comprehension, which required adding
withFilter, which resulted in hours of bafflement.  But I think it's now
working correctly.

Also, tweaked Property.confirmType to be more useful in practice.