Add clauses to declared and defined.
Merge pull request #254 from fmap/fix

Add clauses to declared and defined.