Bring objects.pl output even closer to new format.