Some more code gen progress.