Citation -> MixedCitation plus other tweaks.