Debugging checkpoint.  Most changes are for encapsulating parentSymbol