Also merge other simple constants (SEND_VAL, ECHO etc)
Refactor codes