I'm splitting the previous series up into smaller batches, this is the first one. The next patch in the series broke tests in a weird way, so I'm going to disentangle the rest of the series from that and then re-send those, but these two are ready now.