BUG-7464: Cleanup if-else branches in CNode