Add a bit of strictness to the parser