Ready for review of https://sbprojects.statsbiblioteket.dk/jira/browse/AVISIMPL-160.