A little cleanup of commented-out code that no longer belongs there.