Switch to using marc-marc4j