Some more parserunner cleanup