Prepare for Parser changes.
First test .. worked.