Fix PR8300 by remembering to keep the bitcast in all cases.