Yep, I updated that in this pull. Bottom line is that the reasoning behind why we think we need these `if` statements at the top of our files is flawed.