Implemented some bytecode transforming to fix two things we needed changed in the base code.