Fix more parsing and scanning details.