Updated, the new behavior is conditional to --parser future. Tests also updated.