Improved handling of comments in tricky auto_align situations