Some code scanner enhacements.