More robust parser client internals when handling a changed context