Small tweaks in preparation for being able to do PHP parsing