Cleanup: use default value in header.