Remaining rgagnon source audit improvements (bug #2011)