Updates to remove a race condition if the parse style is updated in the
middle of running.