Address comments: remove default.