Defaults no longer conflict, but we may still want to consider
consolidating where they are defined, in order to avoid future divergence.