PR22348, conflicting global vars in crx and cr16