Changed lifetime stuff in pursuit of singleton perf. Didn't work, but is improvement anyway.