This should help users be more explicit about what action they want to
perform. My hope is that this will also make it easier to migrate off of
paranoia.