Merge upstream and append "last" keyword to \@reply. Clean up regexes