Bug fixes in substitutions, SpecVerify, and VC gen.