Automatically take care of unaliased fields

And thus prevent ambiguous field errors.