[bug 1045982] Little more cleanup.