Speed up file patterns by merging them into a single regex.
Also update CHANGES with the previous changes.