Value variant twiddling

@huonw r?