Move the incremental parser almost entirely over to functions instead of classes.