Some cleanup of dependents (includes a BMC style, which should be fixed upstream in the utilities repo)