Re-organise per-node DEFINES.