A few more value(x) -> x.value() tweaks.