Move format check to Parser