TANAL-106 fix maybe-class short-circuiting