Fixed bug where 'elem' was called unnecessarily.  Fixed bug where unexported fields would try to be added from struct parameters, leading to panics.