Cut semicolon after (Declare|Implement)Descriptor - thus silence the -pedantic.
Fix CHECKVALUE handling in assertion and separate it from the API.