Register empty parentage up front
Fix multiple statements on same line
Merge pull request #308 from wmtan/RegisterEmptyParentageUpFront

Register empty parentage up front