<<choice>>/<<button>> old argument fix

Fixed a bug where the old argument style for <<choice>> (e.g. <<choice
"Cellar" "Let's go">>) wouldn't work. This also applies to <<button>>.