COMP: addressing clang warnings and some other cleaning up

git-svn-id: https://svn.bigr.nl/elastix/trunkpublic@4869 4d348492-3962-11de-aa85-65a2020054a3