Add more-granular logging.
Update alignments.