Snip *other* unrelated changes (sorry)