More assignment polish
Merge branch 'master' of davedive:quackyduck/THC