Backport Allow negative constant at parsing + \r fixup