Make the parser a bit stricter