Improve laser parsing somewhat