Fix minor coverity defects: large stack use and use 'move' when possible. Small tidy of headers also.