@madskristensen, that seems like it now. We can always revert this commit to get back to working solution.   8-)

@SLaks, `Linq's OfType` doesn't work on PropertyList, even when I tried casting it to `IEnumerable<object>`. Should we revert?