Some minor cleanup in the LR35902