Changes per PR comments

Including adding a test ensuring sane behaviour without footnotes.