Check for merge conflict and only raise Informative in that case. Otherwise raise original syntax error.
Assert that error message is good.
Remove unnecessary value assigns.