First part of #638, adding support for including attribute-backed virtual properties