Move from stored/defined properties to calculated ones.