Fix optional/recommended cross-tap dependencies

First cut at fixing #26179