Broaden deps, remove redundant bounds, use data-default-class