Minor cleanup and finger-wagging about a for loop
Land #3056 - Pre-release fixups: Minor description/print_* cleanup