- #3791: Handle third party tools rewriting integers badly