This AddSlashAtEnd can go, but please do it in a separate commit.