Move generator instantiation logic to the base generator and fix a few typos