I know you didn't change this, but I really dislike `new`.  If you could make this a struct literal that'd be super swell.