address coverity defects (local name hiding name in outer scope, copy instead of move); also small optimisations