Re #460: Fix OAI output in custom format.