More changes to objects file for slimming.