Restore MARC scaffolding for people, it seems it does not add too much performance penality (can be still uncommented after tests)