Consider classifying properties

This and a lot of what's going in this pull request looks like it has nothing to do with "Consider classifying properties". Hm. Not a problem if you are cross-reviewing your code and your team members can handle it. But if you want external code reviews you should try to split such changes.