Could you change this to use the fakeClassTag helper that Aaron added in #604?