Minor code cleanups.

1 job for 1438-send-image-attachments-multiple in 8 minutes and 53 seconds (queued for 3 seconds)