Added simple replacement of variable types for interface and class types.