Fix up signatures of generator header