PAHMA-979: more logging improvements.