Cleaned up Yoda style conditions.