This diff snuck into the unrelated: 025a2f73 It's a suggested follow-up for D113212, but I need to add test coverage first.