Both messages are mine, the later one is after I confirmed that it was doing the wrong thing. My intention is to have all the present `geoms` and `stats` working correctly at the end of the PR.

This one needed `fill` to be working correctly before it could be done properly.