Bit rot cleanup, no functional changes.