Update with quantitative-brain-teaser-brain-only fixes [manual commit].