Now with less new / create stubs.