Fix more bugs in when/unless.
Also, re-organize ARG detection.
Merge pull request #48 from Obvious/nick-when-3

Fix more bugs in when/unless. Also, re-organize ARG detection.