More has_key() fixes.

The optparse fix is a fix to the previous fix, which broke has_option().