Tiny changes to extract generation methods.