LPS-48465 Correct inefficient uses of isAssignableFrom() and isInstance()
LPS-48465 Source formatting
LPS-48465 A couple missed spots
LPS-48465 Remove useless code
LPS-48465 Simplify