Some more flexibility for old metadata parsing.