Fix layering violation harder.