NextString and minor cleanup.