bug 1040926: consolidate node definitions