Fixing an issue with circular dependencies.
Reducing the size of noder by replacing some constants by their value.