Reorder stuff.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Don't include the ~ in the string.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
We already alias this.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Prefer to complicate 1 callsite rather than the endpoint.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>