Replace child properties with real properties

A general cleanup.