These have now been removed, and this pull request is much easier to digest :)