chisel: Fixes for control-flow instructions.