Per discussion, this is something we should have sooner rather than later,
and it doesn't take much additional code to support it.