Filter optimisations and cleanup part 1
[melted] / ChangeLog