Backed out changes from 9226 which incorrectly changed the types of some opcodes etc. in a couple of functions.
Authored by: tswift 2018-04-13
Parent: [r9246]
Child: [r9248]
