Parse the commands more generously

r+, r=me, r=[name], r-, and retry are checked more generously.