Cut semicolon after (Declare|Implement)Descriptor - thus silence the -pedantic.
Update service library.