Also make the instances non-global, to prevent multiple instance
problems.