Removed trimming
Removed trimming

Some trimming had been left in the part that does null checking,
resulting in trimmed fields, which should be left up to the user
instead. Also changed the order, so that nulls defined on terms take
precedence over nulls defined on parts.

mwidmeyer/sisula,Roenbaeck/sisula,mwidmeyer/sisula,Roenbaeck/sisula,Roenbaeck/sisula