Small clean up in property inheritance in statement and substatement