remove need to do init by matching on actual end token instead of nil