Remove some cruft from the BitcodeWriter, while still maintaining backward