Half-hearted pass at reorganizing errors.