Changes I've made while developing the source filtering feature.