Eliminated initialization order warning.
Dead object in plan-state detection; HashMap asserts.