[2.0] Make type rules in Add clearer

Taken from #3235, by @boggle