Parser also moved to common / specific variants.