#89555: Fixes for code not being valid.