Moved non-ES constants to macroglex