Appeased some of Splint's complaints.
Merge branch 'debug'