Cleanup ref 69142e7

Not sure I like this anonymous type, but maybe it's OK since it's a global.