bug 1040926 - consolidate node definitions, r=dustin,jwatkins,coop