Further bug reduction.