Can you rebase & update the other new place that uses this? It's in the same file. Also, @sebmarkbage, heads up about that.

Actually, why the rename, you still get a single instance?