Minor cleanup of the old code.