Simplify .~~ a bit