Minor cosmetic fixes and code cleanup.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Minor cosmetic fixes and code cleanup.

Conflicts:
	src/common-cuda.c