So ... @esc24 (or @pp-mo as original author), would you care to weigh in on the remove-redundant-function issue? If we're to do it, it makes sense to me that we do it in this pull request.