fix macros for new MarcExtractor pattern -- some still are doing things inefficiently although they all work
make extract_marc macro use new more efficient pattern of MarcExtractor