pkglint -Wall -F -o align -r (pkglint version 554023c, which already has some fixes for edge cases discovered during the manual review of these changes)
