Parser housekeeping