Merge "rcfilters: Style fixes and cleanup"