Done; see check-in [2222b5b7b0].