Simplify/tweak.