Better handling of mixed citations.