I'd really like to see this repetition addressed, as I mentioned in #1211, before we merge.