A pass on logging/special case handling sections.