More cleanup, thinking about why generation fails