Implement Claude's remarks (except for outro split).