Remove dependency on instanceof operator...