GR-30, types update rules

Not for merge, just comments
Same as above regarding local `cb` variable.