issue #20734: Move trace constants to standard. Other tweaks.