Another pass with improvements.