I prefer the chopped-down version. Whichever way we go, this change is irrelevant to this pull request.