Fix warnings found by the headerclean test

Extra semi-colons at the end of lines, arguments shadowing members, etc.

Change-Id: I8163ed42da31b6a5bb37a56d8cf4c7b2e32139d3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>