* changes: Some code cleanup (4/n) Some code cleanup (3/n) Some code cleanup (2/n) Store object references along with child session Ids (1/n)