Use simplified subtype check in other places