The clang plugin does not not like
   for (<foo>;<foo>;<foo>) ;
(most compilers do not complain, when using the ' ')

Also a virtual destructor need "override" in the
implementing class.

Change-Id: Ib99702f11dbd24595935594ee97c136c8e604aff