More optimizations for NO_NODE compatibility