More code gen cleanup.