syntax: Tidy up parsing the new attribute syntax