Commented out unnecessary definitions
Optimized "D" and "E" for NO_NODE compatibility