Fix up parsing for the new style