Fixed: type var was not found in included generic module from included generic module
Fixed pp macro not escaping quotes