Fixing up handling of conditions.

Anything that wasn't a string wasn't being handled elegantly.