FIX: more accurate objects inference, now less name-dependent.

All objects tests are now passing.