This replaces a number of equal “ht.TOr(ht.TDict, ht.TNone)” checks.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>