Add more rigorous parsing.