More simplification of property functions