Remove the need for -r to have an argument

@jjrussell