Allow blanks in 'r' and 'v' operands.

This is a partial backout of commit 2ea8590164ff7244fe85bff7deb59043f3a0b5e9.