make some intended conversions explicit, fix needless conversions


git-svn-id: svn://svn.code.sf.net/p/cp2k/code/trunk@14668 bac0169d-1eea-4375-b5f6-f89d2ced9994
prettify


git-svn-id: svn://svn.code.sf.net/p/cp2k/code/trunk@14669 bac0169d-1eea-4375-b5f6-f89d2ced9994