trace

Squashed commit of the following:

Merge pull request #74 from gravitational/tener/unwrap-proxy-field

Drop UnmarshalField function, keep other changes.

Rename new function, change implementation.

Add tests for UnwrapProxyField