Great to see this code being cleaned up. I had a swing at the OK filter in a recent commit and it's much saner, returning out as early as possible etc.