Pretty print output improvements.