Avoid using equality checks / %in% on class()

Avoid using equality checks / %in% on class() #186