Last bits of #546.