This change really shouldn't be here; it's anticipating #994 - but that's not implemented here.