I dislike all of the options here. This is the one thing that suggested to me that we might want to do the ES6-ification first.