Avoid the assumption that there are always include patterns: when there
are none (and therefore the renamed file didn't match anyway), just skip
the test for added include.
Also change the code to use `return` to make it flatter.
(Also get rid of a redundant type.)
Fixes#40386.