Now that they are not used in other opcodes by chaining, this can easily be done. Reviewed-by: iustinp