Fix missing output assignments, clean up.